Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull media updates from Mauro Carvalho Chehab:

 - Documentation improvements: conversion of all non-DocBook documents
   to Sphinx and lots of fixes to the uAPI media book

 - New PCI driver for Techwell TW5864 media grabber boards

 - New SoC driver for ATMEL Image Sensor Controller

 - Removal of some obsolete SoC drivers (s5p-tv driver and soc_camera
   drivers)

 - Addition of ST CEC driver

 - Lots of drivers fixes, improvements and additions

* tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits)
  [media] ttusb_dec: avoid the risk of go past buffer
  [media] cx23885: Fix some smatch warnings
  [media] si2165: switch to regmap
  [media] si2165: use i2c_client->dev instead of i2c_adapter->dev for logging
  [media] si2165: Remove legacy attach
  [media] cx231xx: attach si2165 driver via i2c_client
  [media] cx231xx: Prepare for attaching new style i2c_client DVB demod drivers
  [media] cx23885: attach si2165 driver via i2c_client
  [media] si2165: support i2c_client attach
  [media] si2165: avoid division by zero
  [media] rcar-vin: add R-Car gen2 fallback compatibility string
  [media] lgdt3306a: remove 20*50 msec unnecessary timeout
  [media] cx25821: Remove deprecated create_singlethread_workqueue
  [media] cx25821: Drop Freeing of Workqueue
  [media] cxd2841er: force 8MHz bandwidth for DVB-C if specified bw not supported
  [media] redrat3: hardware-specific parameters
  [media] redrat3: remove hw_timeout member
  [media] cxd2841er: BER and SNR reading for ISDB-T
  [media] dvb-usb: avoid link error with dib3000m{b,c|
  [media] dvb-usb: split out common parts of dibusb
  ...
parents 56e520c7 9fce0c22

Documentation/conf.py

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ latex_documents = [ 
     'The kernel development community', 'manual'),

    ('gpu/index', 'gpu.tex', 'Linux GPU Driver Developer\'s Guide',

     'The kernel development community', 'manual'),

    ('media/index', 'media.tex', 'Linux Media Subsystem Documentation',

     'The kernel development community', 'manual'),

]



# The name of an image file (relative to this directory) to place at the top of

Documentation/devicetree/bindings/media/atmel-isc.txt

0 → 100644
+65 −0
Original line number Diff line number Diff line 
Atmel Image Sensor Controller (ISC)

----------------------------------------------



Required properties for ISC:

- compatible

	Must be "atmel,sama5d2-isc".

- reg

	Physical base address and length of the registers set for the device.

- interrupts

	Should contain IRQ line for the ISC.

- clocks

	List of clock specifiers, corresponding to entries in

	the clock-names property;

	Please refer to clock-bindings.txt.

- clock-names

	Required elements: "hclock", "iscck", "gck".

- #clock-cells

	Should be 0.

- clock-output-names

	Should be "isc-mck".

- pinctrl-names, pinctrl-0

	Please refer to pinctrl-bindings.txt.



ISC supports a single port node with parallel bus. It should contain one

'port' child node with child 'endpoint' node. Please refer to the bindings

defined in Documentation/devicetree/bindings/media/video-interfaces.txt.



Example:

isc: isc@f0008000 {

	compatible = "atmel,sama5d2-isc";

	reg = <0xf0008000 0x4000>;

	interrupts = <46 IRQ_TYPE_LEVEL_HIGH 5>;

	clocks = <&isc_clk>, <&iscck>, <&isc_gclk>;

	clock-names = "hclock", "iscck", "gck";

	#clock-cells = <0>;

	clock-output-names = "isc-mck";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;



	port {

		isc_0: endpoint {

			remote-endpoint = <&ov7740_0>;

			hsync-active = <1>;

			vsync-active = <0>;

			pclk-sample = <1>;

		};

	};

};



i2c1: i2c@fc028000 {

	ov7740: camera@21 {

		compatible = "ovti,ov7740";

		reg = <0x21>;

		clocks = <&isc>;

		clock-names = "xvclk";

		assigned-clocks = <&isc>;

		assigned-clock-rates = <24000000>;



		port {

			ov7740_0: endpoint {

				remote-endpoint = <&isc_0>;

			};

		};

	};

};

Documentation/devicetree/bindings/media/exynos4-fimc-is.txt

+4 −3
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ Required properties: 
- clocks	: list of clock specifiers, corresponding to entries in

		  clock-names property;

- clock-names	: must contain "ppmuispx", "ppmuispx", "lite0", "lite1"

		  "mpll", "sysreg", "isp", "drc", "fd", "mcuisp", "uart",

		  "ispdiv0", "ispdiv1", "mcuispdiv0", "mcuispdiv1", "aclk200",

		  "div_aclk200", "aclk400mcuisp", "div_aclk400mcuisp" entries,

		  "mpll", "sysreg", "isp", "drc", "fd", "mcuisp", "gicisp",

		  "pwm_isp", "mcuctl_isp", "uart", "ispdiv0", "ispdiv1",

		  "mcuispdiv0", "mcuispdiv1", "aclk200", "div_aclk200",

		  "aclk400mcuisp", "div_aclk400mcuisp" entries,

		  matching entries in the clocks property.

pmu subnode

-----------

Documentation/devicetree/bindings/media/i2c/ad5820.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Analog Devices AD5820 autofocus coil



Required Properties:



  - compatible: Must contain "adi,ad5820"



  - reg: I2C slave address



  - VANA-supply: supply of voltage for VANA pin



Example:



       ad5820: coil@c {

               compatible = "adi,ad5820";

               reg = <0x0c>;



               VANA-supply = <&vaux4>;

       };

Documentation/devicetree/bindings/media/i2c/adv7180.txt

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ Required Properties : 
		"adi,adv7282"

		"adi,adv7282-m"



Optional Properties :

- powerdown-gpios: reference to the GPIO connected to the powerdown pin,

  if any.





Example:



	i2c0@1c22000 {