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

Commit a3639d31 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: Remove "qcom,cam-vreg-type" property"

parents 0635307b ac026312

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

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

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -137,7 +136,6 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -214,7 +212,6 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -246,7 +243,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

		qcom,cam-vreg-op-mode = <105000 80000 0>;
@@ -278,7 +274,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

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

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -137,7 +136,6 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -179,7 +177,6 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -211,7 +208,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

		qcom,cam-vreg-op-mode = <105000 80000 0>;
@@ -243,7 +239,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

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

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

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -118,7 +117,6 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -159,7 +157,6 @@ 
		cam_vio-supply = <&pma8084_lvs4>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -191,7 +188,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

		qcom,cam-vreg-op-mode = <105000 80000 0>;
@@ -223,7 +219,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

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

arch/arm/boot/dts/qcom/apq8084-camera-sensor-sbc.dtsi

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

		cam_vaf-supply = <&pma8084_l23>;

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

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

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -119,7 +118,6 @@ 
		cam_vio-supply = <&pma8084_lvs2>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -160,7 +158,6 @@ 
		cam_vio-supply = <&pma8084_lvs2>;

		cam_vana-supply = <&pma8084_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 2800000>;

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

		qcom,cam-vreg-op-mode = <105000 0 80000>;
@@ -192,7 +189,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs4>;

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

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

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

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

		qcom,cam-vreg-op-mode = <105000 80000 0>;
@@ -223,7 +219,6 @@ 
		cam_vdig-supply = <&pma8084_l15>;

		cam_vio-supply = <&pma8084_lvs3>;

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

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

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

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

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