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

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

Merge "ARM: dts: msm: camera: Remove dts entries for vreg-type"

parents d98017ba 9b042ef9

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

+0 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -42,7 +41,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -55,7 +53,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -143,7 +140,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -188,7 +184,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -226,7 +221,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

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

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -265,7 +259,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

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

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -306,7 +299,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

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

		qcom,cam-vreg-type = <0 1 0>;

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

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -42,7 +41,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -55,7 +53,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -143,7 +140,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -188,7 +184,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -225,7 +220,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l10>;

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

		qcom,cam-vreg-type = <1 0>;

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

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

		qcom,cam-vreg-op-mode = <0 80000>;
@@ -262,7 +256,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

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

		qcom,cam-vreg-type = <0 1 0>;

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

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;

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

+0 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -42,7 +41,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -56,7 +54,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8994_l23>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-type = <0>;

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -144,7 +141,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -189,7 +185,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -227,7 +222,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

		qcom,cam-vreg-type = <0 1 0>;

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

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -266,7 +260,6 @@ 
		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

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

		qcom,cam-vreg-type = <0 1 0>;

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

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;