ARM: dts: msm: Fix camera eeprom configuration for sdm845 platform
Eeproms may need the vaf regulators for operation. The regulator node
takes care of enabling the gpios associated with the LDO.
Add vaf voltage levels and remove the vaf gpio from the eeprom node.
Change-Id: Ia08fc7675efd7f3aedef484447f3fe622bcca71d
Signed-off-by: Wei Ding <weiding@codeaurora.org>
Signed-off-by: Soundrapandian Jeyaprakash <jsoundra@codeaurora.org>
diff --git a/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-cdp.dtsi
index dc520a9..7ca2645 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-cdp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-cdp.dtsi
@@ -126,9 +126,9 @@
regulator-names = "cam_vio", "cam_vana", "cam_vdig",
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
- rgltr-min-voltage = <0 3312000 1050000 0>;
- rgltr-max-voltage = <0 3600000 1050000 0>;
- rgltr-load-current = <0 80000 105000 0>;
+ rgltr-min-voltage = <0 3312000 1050000 0 2800000>;
+ rgltr-max-voltage = <0 3600000 1050000 0 2800000>;
+ rgltr-load-current = <0 80000 105000 0 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active
@@ -137,17 +137,14 @@
&cam_sensor_rear_suspend>;
gpios = <&tlmm 13 0>,
<&tlmm 80 0>,
- <&tlmm 79 0>,
- <&tlmm 27 0>;
+ <&tlmm 79 0>;
gpio-reset = <1>;
gpio-vana = <2>;
- gpio-vaf = <3>;
- gpio-req-tbl-num = <0 1 2 3>;
- gpio-req-tbl-flags = <1 0 0 0>;
+ gpio-req-tbl-num = <0 1 2>;
+ gpio-req-tbl-flags = <1 0 0>;
gpio-req-tbl-label = "CAMIF_MCLK0",
"CAM_RESET0",
- "CAM_VANA0",
- "CAM_VAF";
+ "CAM_VANA0";
sensor-position = <0>;
sensor-mode = <0>;
cci-master = <0>;
@@ -170,9 +167,9 @@
regulator-names = "cam_vdig", "cam_vio", "cam_vana",
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
- rgltr-min-voltage = <1050000 0 3312000 0>;
- rgltr-max-voltage = <1050000 0 3600000 0>;
- rgltr-load-current = <105000 0 80000 0>;
+ rgltr-min-voltage = <1050000 0 3312000 0 2800000>;
+ rgltr-max-voltage = <1050000 0 3600000 0 2800000>;
+ rgltr-load-current = <105000 0 80000 0 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active
@@ -181,17 +178,14 @@
&cam_sensor_rear2_suspend>;
gpios = <&tlmm 15 0>,
<&tlmm 9 0>,
- <&tlmm 8 0>,
- <&tlmm 27 0>;
+ <&tlmm 8 0>;
gpio-reset = <1>;
gpio-vana = <2>;
- gpio-vaf = <3>;
- gpio-req-tbl-num = <0 1 2 3>;
- gpio-req-tbl-flags = <1 0 0 0>;
+ gpio-req-tbl-num = <0 1 2>;
+ gpio-req-tbl-flags = <1 0 0>;
gpio-req-tbl-label = "CAMIF_MCLK1",
"CAM_RESET1",
- "CAM_VANA1",
- "CAM_VAF";
+ "CAM_VANA1";
sensor-position = <0>;
sensor-mode = <0>;
cci-master = <1>;
@@ -214,9 +208,9 @@
regulator-names = "cam_vio", "cam_vana", "cam_vdig",
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
- rgltr-min-voltage = <0 3312000 1050000 0>;
- rgltr-max-voltage = <0 3600000 1050000 0>;
- rgltr-load-current = <0 80000 105000 0>;
+ rgltr-min-voltage = <0 3312000 1050000 0 2800000>;
+ rgltr-max-voltage = <0 3600000 1050000 0 2800000>;
+ rgltr-load-current = <0 80000 105000 0 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active
@@ -225,17 +219,14 @@
&cam_sensor_front_suspend>;
gpios = <&tlmm 14 0>,
<&tlmm 28 0>,
- <&tlmm 8 0>,
- <&tlmm 27 0>;
+ <&tlmm 8 0>;
gpio-reset = <1>;
gpio-vana = <2>;
- gpio-vaf = <3>;
- gpio-req-tbl-num = <0 1 2 3>;
- gpio-req-tbl-flags = <1 0 0 0>;
+ gpio-req-tbl-num = <0 1 2>;
+ gpio-req-tbl-flags = <1 0 0>;
gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2",
- "CAM_VANA2",
- "CAM_VAF";
+ "CAM_VANA2";
sensor-position = <1>;
sensor-mode = <0>;
cci-master = <1>;
diff --git a/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-mtp.dtsi
index b723802..aa55698 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-camera-sensor-mtp.dtsi
@@ -126,9 +126,9 @@
regulator-names = "cam_vio", "cam_vana", "cam_vdig",
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
- rgltr-min-voltage = <0 3312000 1050000 0>;
- rgltr-max-voltage = <0 3600000 1050000 0>;
- rgltr-load-current = <0 80000 105000 0>;
+ rgltr-min-voltage = <0 3312000 1050000 0 2800000>;
+ rgltr-max-voltage = <0 3600000 1050000 0 2800000>;
+ rgltr-load-current = <0 80000 105000 0 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active
@@ -137,17 +137,14 @@
&cam_sensor_rear_suspend>;
gpios = <&tlmm 13 0>,
<&tlmm 80 0>,
- <&tlmm 79 0>,
- <&tlmm 27 0>;
+ <&tlmm 79 0>;
gpio-reset = <1>;
gpio-vana = <2>;
- gpio-vaf = <3>;
- gpio-req-tbl-num = <0 1 2 3>;
- gpio-req-tbl-flags = <1 0 0 0>;
+ gpio-req-tbl-num = <0 1 2>;
+ gpio-req-tbl-flags = <1 0 0>;
gpio-req-tbl-label = "CAMIF_MCLK0",
"CAM_RESET0",
- "CAM_VANA0",
- "CAM_VAF";
+ "CAM_VANA0";
sensor-position = <0>;
sensor-mode = <0>;
cci-master = <0>;
@@ -170,9 +167,9 @@
regulator-names = "cam_vdig", "cam_vio", "cam_vana",
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
- rgltr-min-voltage = <1050000 0 3312000 0>;
- rgltr-max-voltage = <1050000 0 3600000 0>;
- rgltr-load-current = <105000 0 80000 0>;
+ rgltr-min-voltage = <1050000 0 3312000 0 2800000>;
+ rgltr-max-voltage = <1050000 0 3600000 0 2800000>;
+ rgltr-load-current = <105000 0 80000 0 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active
@@ -181,17 +178,14 @@
&cam_sensor_rear2_suspend>;
gpios = <&tlmm 15 0>,
<&tlmm 9 0>,
- <&tlmm 8 0>,
- <&tlmm 27 0>;
+ <&tlmm 8 0>;
gpio-reset = <1>;
gpio-vana = <2>;
- gpio-vaf = <3>;
- gpio-req-tbl-num = <0 1 2 3>;
- gpio-req-tbl-flags = <1 0 0 0>;
+ gpio-req-tbl-num = <0 1 2>;
+ gpio-req-tbl-flags = <1 0 0>;
gpio-req-tbl-label = "CAMIF_MCLK1",
"CAM_RESET1",
- "CAM_VANA1",
- "CAM_VAF";
+ "CAM_VANA1";
sensor-position = <0>;
sensor-mode = <0>;
cci-master = <1>;
@@ -214,9 +208,9 @@
regulator-names = "cam_vio", "cam_vana", "cam_vdig",
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
- rgltr-min-voltage = <0 3312000 1050000 0>;
- rgltr-max-voltage = <0 3600000 1050000 0>;
- rgltr-load-current = <0 80000 105000 0>;
+ rgltr-min-voltage = <0 3312000 1050000 0 2800000>;
+ rgltr-max-voltage = <0 3600000 1050000 0 2800000>;
+ rgltr-load-current = <0 80000 105000 0 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active
@@ -225,17 +219,14 @@
&cam_sensor_front_suspend>;
gpios = <&tlmm 14 0>,
<&tlmm 28 0>,
- <&tlmm 8 0>,
- <&tlmm 27 0>;
+ <&tlmm 8 0>;
gpio-reset = <1>;
gpio-vana = <2>;
- gpio-vaf = <3>;
- gpio-req-tbl-num = <0 1 2 3>;
- gpio-req-tbl-flags = <1 0 0 0>;
+ gpio-req-tbl-num = <0 1 2>;
+ gpio-req-tbl-flags = <1 0 0>;
gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2",
- "CAM_VANA2",
- "CAM_VAF";
+ "CAM_VANA2";
sensor-position = <1>;
sensor-mode = <0>;
cci-master = <1>;