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

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

Merge "UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into... 

Merge "UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into msm-4.9 (mainline) - 10/18"
parents 118dca14 e094ff8b

Documentation/devicetree/bindings/media/video/msm-cam-cpas.txt

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ First Level Node - CAM CPAS device 
  Value type: <u32>

  Definition: Interrupt associated with CAMNOC HW.



- qcom,cpas-hw-ver

  Usage: required

  Value type: <u32>

  Definition: CAM HW Version information.



- regulator-names

  Usage: required

  Value type: <string>
@@ -181,6 +186,7 @@ Example: 
		reg-cam-base = <0x40000 0x42000>;

		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170100>; /* Titan v170 v1.0.0 */

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-camera-sensor-cdp.dtsi

+21 −30
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		rgltr-min-voltage = <0 3312000 1050000 0 2800000>;

		rgltr-max-voltage = <0 3600000 1050000 0 2800000>;

		rgltr-load-current = <0 80000 105000 0 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -137,17 +137,14 @@ 
				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 13 0>,

			<&tlmm 80 0>,

			<&tlmm 79 0>,

			<&tlmm 27 0>;

			<&tlmm 79 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-vaf = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK0",

					"CAM_RESET0",

					"CAM_VANA0",

					"CAM_VAF";

					"CAM_VANA0";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <0>;
@@ -170,9 +167,9 @@ 
		regulator-names = "cam_vdig", "cam_vio", "cam_vana",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1050000 0 3312000 0>;

		rgltr-max-voltage = <1050000 0 3600000 0>;

		rgltr-load-current = <105000 0 80000 0>;

		rgltr-min-voltage = <1050000 0 3312000 0 2800000>;

		rgltr-max-voltage = <1050000 0 3600000 0 2800000>;

		rgltr-load-current = <105000 0 80000 0 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -181,17 +178,14 @@ 
				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>,

			<&tlmm 27 0>;

			<&tlmm 8 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-vaf = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK1",

					"CAM_RESET1",

					"CAM_VANA1",

					"CAM_VAF";

					"CAM_VANA1";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;
@@ -214,9 +208,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		rgltr-min-voltage = <0 3312000 1050000 0 2800000>;

		rgltr-max-voltage = <0 3600000 1050000 0 2800000>;

		rgltr-load-current = <0 80000 105000 0 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -225,17 +219,14 @@ 
				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&tlmm 8 0>,

			<&tlmm 27 0>;

			<&tlmm 8 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-vaf = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK2",

					"CAM_RESET2",

					"CAM_VANA2",

					"CAM_VAF";

					"CAM_VANA2";

		sensor-position = <1>;

		sensor-mode = <0>;

		cci-master = <1>;

arch/arm64/boot/dts/qcom/sdm845-camera-sensor-mtp.dtsi

+21 −30
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		rgltr-min-voltage = <0 3312000 1050000 0 2800000>;

		rgltr-max-voltage = <0 3600000 1050000 0 2800000>;

		rgltr-load-current = <0 80000 105000 0 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -137,17 +137,14 @@ 
				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 13 0>,

			<&tlmm 80 0>,

			<&tlmm 79 0>,

			<&tlmm 27 0>;

			<&tlmm 79 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-vaf = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK0",

					"CAM_RESET0",

					"CAM_VANA0",

					"CAM_VAF";

					"CAM_VANA0";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <0>;
@@ -170,9 +167,9 @@ 
		regulator-names = "cam_vdig", "cam_vio", "cam_vana",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1050000 0 3312000 0>;

		rgltr-max-voltage = <1050000 0 3600000 0>;

		rgltr-load-current = <105000 0 80000 0>;

		rgltr-min-voltage = <1050000 0 3312000 0 2800000>;

		rgltr-max-voltage = <1050000 0 3600000 0 2800000>;

		rgltr-load-current = <105000 0 80000 0 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -181,17 +178,14 @@ 
				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 15 0>,

			<&tlmm 9 0>,

			<&tlmm 8 0>,

			<&tlmm 27 0>;

			<&tlmm 8 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-vaf = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK1",

					"CAM_RESET1",

					"CAM_VANA1",

					"CAM_VAF";

					"CAM_VANA1";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;
@@ -214,9 +208,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 3312000 1050000 0>;

		rgltr-max-voltage = <0 3600000 1050000 0>;

		rgltr-load-current = <0 80000 105000 0>;

		rgltr-min-voltage = <0 3312000 1050000 0 2800000>;

		rgltr-max-voltage = <0 3600000 1050000 0 2800000>;

		rgltr-load-current = <0 80000 105000 0 0>;

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -225,17 +219,14 @@ 
				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&tlmm 8 0>,

			<&tlmm 27 0>;

			<&tlmm 8 0>;

		gpio-reset = <1>;

		gpio-vana = <2>;

		gpio-vaf = <3>;

		gpio-req-tbl-num = <0 1 2 3>;

		gpio-req-tbl-flags = <1 0 0 0>;

		gpio-req-tbl-num = <0 1 2>;

		gpio-req-tbl-flags = <1 0 0>;

		gpio-req-tbl-label = "CAMIF_MCLK2",

					"CAM_RESET2",

					"CAM_VANA2",

					"CAM_VAF";

					"CAM_VANA2";

		sensor-position = <1>;

		sensor-mode = <0>;

		cci-master = <1>;

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ 
		reg-cam-base = <0x40000 0x42000>;

		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170100>; /* Titan v170 v1.0.0 */

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ 
		reg-cam-base = <0x40000 0x42000>;

		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170110>; /* Titan v170 v1.1.0 */

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",