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

Commit 19dd5839 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 ac8e2409 06c4cb05

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

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,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 = <105000 80000 0>;

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

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

		cam_vaf-supply = <&pm8226_l15>;

		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>;
@@ -44,7 +43,6 @@ 
		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm8226_l15>;

		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>;
@@ -64,7 +62,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -99,7 +96,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -138,7 +134,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -176,7 +171,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -213,7 +207,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -244,7 +237,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

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

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

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

		cam_vaf-supply = <&pm8226_l15>;

		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>;
@@ -51,7 +50,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -85,7 +83,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -123,7 +120,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -155,7 +151,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

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

arch/arm/boot/dts/qcom/msm8226-camera-sensor-qrd.dtsi

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

		cam_vaf-supply = <&pm8226_l15>;

		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>;
@@ -84,7 +83,6 @@ 
		cam_vdig-supply = <&pm8226_l5>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0>;
@@ -125,7 +123,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -228,7 +225,6 @@ 
		cam_vio-supply = <&pm8226_lvs1>;

		cam_vana-supply = <&pm8226_l19>;

		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>;
@@ -271,7 +267,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <120000 0 0 80000>;
@@ -311,7 +306,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -375,7 +369,6 @@ 
		cam_vio-supply = <&pm8226_lvs1>;

		cam_vana-supply = <&pm8226_l19>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -416,7 +409,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -458,7 +450,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -497,7 +488,6 @@ 
		cam_vana-supply = <&pm8226_l19>;

		cam_vio-supply = <&pm8226_lvs1>;

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

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

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

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

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

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

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

		cam_vaf-supply = <&pm8110_l16>;

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

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

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

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

		qcom,cam-vreg-op-mode = <100000>;
@@ -90,7 +89,6 @@ 
		cam_vdig-supply = <&pm8110_l2>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 8000>;
@@ -131,7 +129,6 @@ 
		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 8000 80000>;
@@ -167,7 +164,6 @@ 
		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 8000 80000>;
@@ -201,7 +197,6 @@ 
		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 0 80000>;
@@ -239,7 +234,6 @@ 
		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 80000 80000>;
@@ -277,7 +271,6 @@ 
		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

		qcom,cam-vreg-op-mode = <200000 8000 80000>;
@@ -309,7 +302,6 @@ 
		cam_vana-supply = <&pm8110_l19>;

		cam_vio-supply = <&pm8110_l14>;

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

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

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

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

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