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

Commit 56d2bd6a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "TvTuner: Add support for TV tuner driver"

parents 978eecc4 ff2dc69c

Documentation/devicetree/bindings/arm/msm/adv7481.txt

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ Required properties 
	interrupt 1, interrupt 2 and interrupt 3.

- cam_vdig-supply: Should contain regulator to be used for the digital

	vdd.

- tx-lanes: Should contain array of csi transmission lanes required

	to select csi lane by adv7481 driver.

- settle-count: Should contain array of csi settle count required

	to select settle count by adv7481 driver.

- res-array: Should contain array of resolution supported by

	adv7481 driver.

- cam_vio-supply: Should contain regulator to be used for the IO vdd.

- cam_vana-supply: Should contain regulator from which analog voltage

	is supplied.
@@ -35,6 +41,9 @@ Example: 
		compatible = "qcom,adv7481";

		reg = <0x70 0xff>;

		cam_vdig-supply = <&vph_pwr_vreg>;

                tx-lanes = <4 2 1>;

                settle-count = <16 16 16>;

                res-array = "RES_1080P", "RES_720P", "RES_576P_480P";

		/* Cameras powered by PMIC: */

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

Documentation/devicetree/bindings/arm/msm/tv-tuner.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
TVTUNER driver (VIDEO_TVTUNER)



VIDEO_TVTUNER is a sample kernel platform driver that is used to control the tv

tuner hardware for the capture of Tv tuner received a/v signal.



The devicetree representation of the VIDEO_TVTUNER block should be:



Required properties



- compatible: "qcom,tv-tuner"



Example:

	qcom,tv-tuner {

		compatible = "qcom,tv-tuner";

	};

Documentation/devicetree/bindings/media/video/msm-ba.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 
              "qcom,name", "qcom,ba-input", "qcom,ba-output", "qcom,sd-name",

              "qcom,ba-node" and "qcom,user-type".

Required properties:

- qcom,type: Input type such as CVBS(0), HDMI(4) etc as defined in BA driver.

- qcom,type: Input type such as CVBS(0), HDMI(4), TUNER(8) etc as defined in BA driver.

             This property is of type u32.

- qcom,name: Name of the input type. This property is of type string.

- qcom,ba-input: BA input id supported by a bridge chip for this profile.

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1137,9 +1137,9 @@ 
		compatible = "qcom,adv7481";

		reg = <0x70 0xff>;

		cam_vdig-supply = <&pm8994_s3>;

		tx_lanes = <4 2 1>;

		settle_count = <16 16 16>;

		res_array = "RES_1080P", "RES_720P", "RES_576P_480P";

		tx-lanes = <4 2 1>;

		settle-count = <16 16 16>;

		res-array = "RES_1080P", "RES_720P", "RES_576P_480P";

		/* Cameras powered by PMIC: */

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

drivers/media/i2c/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -233,6 +233,18 @@ config VIDEO_ADV7481 
	  To compile this driver as a module, choose M here: the

	  module will be called adv7481.



config VIDEO_TVTUNER

	tristate "Analog Tv Tuner driver"

	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API

	---help---

	  Support for the Dummy TV Tuner.



	  This is a Dummy TV Tuner Driver to Validate call flow

	  from tv_input_test unit-test app.



	  To compile this driver as a module, choose M here: the

	  module will be called tv-tuner.



config VIDEO_BT819

	tristate "BT819A VideoStream decoder"

	depends on VIDEO_V4L2 && I2C