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

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

Merge "msm: camera: sensor: Add cx supply in camera dtsi for msm8996"

parents 16dd21ff e8e8b107

arch/arm/boot/dts/qcom/msm8996-camera-sensor-adp.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ 
		cam_vdig-supply = <&pm8994_s3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;

		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
@@ -166,6 +168,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pmi8994_boostbypass>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 3150000>;

		qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
@@ -207,6 +211,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1000000 0 2800000>;

arch/arm/boot/dts/qcom/msm8996-camera-sensor-cdp.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ 
		cam_vdig-supply = <&pm8994_s3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;

		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
@@ -178,6 +180,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pmi8994_boostbypass>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 3150000>;

		qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
@@ -218,6 +222,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1000000 0 2800000>;

arch/arm/boot/dts/qcom/msm8996-camera-sensor-dtp.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ 
		cam_vdig-supply = <&pm8994_s3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;

		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
@@ -164,6 +166,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pmi8994_boostbypass>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 3150000>;

		qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
@@ -206,6 +210,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000>;

arch/arm/boot/dts/qcom/msm8996-camera-sensor-liquid.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ 
		cam_vdig-supply = <&pm8994_s3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;

		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
@@ -177,6 +179,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pmi8994_boostbypass>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 3150000>;

		qcom,cam-vreg-max-voltage = <1000000 0 3600000>;
@@ -218,6 +222,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1000000 0 2800000>;

arch/arm/boot/dts/qcom/msm8996-camera-sensor-mtp.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ 
		cam_vdig-supply = <&pm8994_s3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;

		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
@@ -180,6 +182,8 @@ 
		cam_vdig-supply = <&pm8994_s3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;

		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
@@ -221,6 +225,8 @@ 
		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,vdd-cx-supply = <&pm8994_s1_corner>;

		qcom,vdd-cx-name = "qcom,vdd-cx";

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-min-voltage = <1000000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1000000 0 2800000>;