Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Commit

Permalink
Merge "ARM: dts: msm: camera: Remove dts entries for vreg-type"
Browse files Browse the repository at this point in the history
  • Loading branch information
Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Oct 10, 2014
2 parents d98017b + 9b042ef commit 384d6b2
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 22 deletions.
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/qcom/msm8994-camera-sensor-cdp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand All @@ -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>;
Expand All @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/qcom/msm8994-camera-sensor-liquid.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand All @@ -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>;
Expand All @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/qcom/msm8994-camera-sensor-mtp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand All @@ -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>;
Expand All @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down Expand Up @@ -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>;
Expand Down

0 comments on commit 384d6b2

Please sign in to comment.