Commit a98f670e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:

 - Media documentation is now split into admin-guide, driver-api and
   userspace-api books (a longstanding request from Jon);

 - The media Kconfig was reorganized, in order to make easier to select
   drivers and their dependencies;

 - The testing drivers now has a separate directory;

 - added a new driver for Rockchip Video Decoder IP;

 - The atomisp staging driver was resurrected. It is meant to work with
   4 generations of cameras on Atom-based laptops, tablets and cell
   phones. So, it seems worth investing time to cleanup this driver and
   making it in good shape.

 - Added some V4L2 core ancillary routines to help with h264 codecs;

 - Added an ov2740 image sensor driver;

 - The si2157 gained support for Analog TV, which, in turn, added
   support for some cx231xx and cx23885 boards to also support analog
   standards;

 - Added some V4L2 controls (V4L2_CID_CAMERA_ORIENTATION and
   V4L2_CID_CAMERA_SENSOR_ROTATION) to help identifying where the camera
   is located at the device;

 - VIDIOC_ENUM_FMT was extended to support MC-centric devices;

 - Lots of drivers improvements and cleanups.

* tag 'media/v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (503 commits)
  media: Documentation: media: Refer to mbus format documentation from CSI-2 docs
  media: s5k5baf: Replace zero-length array with flexible-array
  media: i2c: imx219: Drop <linux/clk-provider.h> and <linux/clkdev.h>
  media: i2c: Add ov2740 image sensor driver
  media: ov8856: Implement sensor module revision identification
  media: ov8856: Add devicetree support
  media: dt-bindings: ov8856: Document YAML bindings
  media: dvb-usb: Add Cinergy S2 PCIe Dual Port support
  media: dvbdev: Fix tuner->demod media controller link
  media: dt-bindings: phy: phy-rockchip-dphy-rx0: move rockchip dphy rx0 bindings out of staging
  media: staging: dt-bindings: phy-rockchip-dphy-rx0: remove non-used reg property
  media: atomisp: unify the version for isp2401 a0 and b0 versions
  media: atomisp: update TODO with the current data
  media: atomisp: adjust some code at sh_css that could be broken
  media: atomisp: don't produce errs for ignored IRQs
  media: atomisp: print IRQ when debugging
  media: atomisp: isp_mmu: don't use kmem_cache
  media: atomisp: add a notice about possible leak resources
  media: atomisp: disable the dynamic and reserved pools
  media: atomisp: turn on camera before setting it
  ...
parents ee01c4d7 938b29db

Documentation/ABI/testing/debugfs-cec-error-inj

+1 −1
Original line number Diff line number Diff line
@@ -37,4 +37,4 @@ when changes are made. 


The following CEC error injection implementations exist:



- Documentation/media/uapi/cec/cec-pin-error-inj.rst
 
- Documentation/userspace-api/media/cec/cec-pin-error-inj.rst

Documentation/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -55,15 +55,15 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . 
loop_cmd = $(echo-cmd) $(cmd_$(1)) || exit;



# $2 sphinx builder e.g. "html"

# $3 name of the build subfolder / e.g. "media", used as:

# $3 name of the build subfolder / e.g. "userspace-api/media", used as:

#    * dest folder relative to $(BUILDDIR) and

#    * cache folder relative to $(BUILDDIR)/.doctrees

# $4 dest subfolder e.g. "man" for man pages at media/man

# $4 dest subfolder e.g. "man" for man pages at userspace-api/media/man

# $5 reST source folder relative to $(srctree)/$(src),

#    e.g. "media" for the linux-tv book-set at ./Documentation/media

#    e.g. "userspace-api/media" for the linux-tv book-set at ./Documentation/userspace-api/media



quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)

      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2 && \

      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media $2 && \

	PYTHONDONTWRITEBYTECODE=1 \

	BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \

	$(PYTHON) $(srctree)/scripts/jobserver-exec \
@@ -124,7 +124,7 @@ refcheckdocs: 


cleandocs:

	$(Q)rm -rf $(BUILDDIR)

	$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean

	$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media clean



dochelp:

	@echo  ' Linux kernel internal documentation in different formats from ReST:'

Documentation/admin-guide/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ configure specific aspects of kernel behavior to your liking. 
   lockup-watchdogs

   LSM/index

   md

   media/index

   mm/index

   module-signing

   mono

Documentation/admin-guide/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ 
	bttv.card=	[HW,V4L] bttv (bt848 + bt878 based grabber cards)

	bttv.radio=	Most important insmod options are available as

			kernel args too.

	bttv.pll=	See Documentation/media/v4l-drivers/bttv.rst

	bttv.pll=	See Documentation/admin-guide/media/bttv.rst

	bttv.tuner=



	bulk_remove=off	[PPC]  This parameter disables the use of the pSeries
@@ -2746,7 +2746,7 @@ 
			See Documentation/admin-guide/pm/sleep-states.rst.



	meye.*=		[HW] Set MotionEye Camera parameters

			See Documentation/media/v4l-drivers/meye.rst.

			See Documentation/admin-guide/media/meye.rst.



	mfgpt_irq=	[IA-32] Specify the IRQ to use for the

			Multi-Function General Purpose Timers on AMD Geode

CRA Git | Maintained and supported by SUSTech CRA and CCSE