ARM: dts: msm: Add fix for regulator voltage for holi camera

-Regulator framework for pm8008 accepts only the voltages to be in
 multiple of 8mv , So this change rounds of the vdig supply in s5k3p9
 and imx476 to 1.056 instead of 1.05
-Fixed typo in camera-device tree file.

CRs-Fixed: 2733427
Change-Id: If801b781d08f4ab2bbfa4d866585c2ef99d2c2ac
This commit is contained in:
shiwgupt 2020-08-12 20:15:08 +05:30
commit d8ed1c7841
4 changed files with 86 additions and 86 deletions

View file

@ -18,8 +18,8 @@
status = "ok"
};
led_flash_rear_aux2: qcom,camera-flash@2 {
cell-index = <2>;
led_flash_rear_aux2: qcom,camera-flash@3 {
cell-index = <3>;
compatible = "qcom,camera-flash";
flash-source = <&pm6150l_flash0 &pm6150l_flash1>;
torch-source = <&pm6150l_torch0 &pm6150l_torch1>;
@ -59,8 +59,8 @@
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>;
rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>;
rgltr-min-voltage = <1800000 2800000 1056000 0 2800000>;
rgltr-max-voltage = <1800000 2800000 1056000 0 2800000>;
rgltr-load-current = <120000 80000 1200000 0 100000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -84,8 +84,8 @@
clock-rates = <19200000>;
};
eeprom_rear_aux: qcom,eeprom1 {
cell-index = <1>;
eeprom_rear_aux2: qcom,eeprom3 {
cell-index = <3>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
@ -139,8 +139,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <120000 80000 1200000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -164,16 +164,16 @@
clock-rates = <19200000>;
};
/*Rear Aux*/
qcom,cam-sensor1 {
cell-index = <1>;
/*Rear Aux2*/
qcom,cam-sensor3 {
cell-index = <3>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
led-flash-src = <&led_flash_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
cam_vdig-supply = <&L1P>;
@ -209,10 +209,10 @@
};
&cam_cci1 {
actuator_rear_aux2: qcom,actuator3 {
cell-index = <3>;
actuator_rear_aux: qcom,actuator1 {
cell-index = <1>;
compatible = "qcom,actuator";
cci-device = <1>;
cci-master= <0>;
cam_vaf-supply = <&L5P>;
regulator-names = "cam_vaf";
rgltr-cntrl-support;
@ -233,8 +233,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <0 80000 105000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -258,8 +258,8 @@
clock-rates = <24000000>;
};
eeprom_rear_aux2: qcom,eeprom3 {
cell-index = <3>;
eeprom_rear_aux: qcom,eeprom1 {
cell-index = <1>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
@ -312,8 +312,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <0 80000 105000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -337,17 +337,17 @@
clock-rates = <24000000>;
};
/*Rear Aux2*/
qcom,cam-sensor3 {
cell-index = <3>;
/*Rear Aux*/
qcom,cam-sensor1 {
cell-index = <1>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <2>;
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear_aux2>;
actuator-src = <&actuator_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
led-flash-src = <&led_flash_rear_aux>;
actuator-src = <&actuator_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
cam_vdig-supply = <&L1P>;

View file

@ -18,8 +18,8 @@
status = "ok"
};
led_flash_rear_aux2: qcom,camera-flash@2 {
cell-index = <2>;
led_flash_rear_aux2: qcom,camera-flash@3 {
cell-index = <3>;
compatible = "qcom,camera-flash";
flash-source = <&pm6150l_flash0 &pm6150l_flash1>;
torch-source = <&pm6150l_torch0 &pm6150l_torch1>;
@ -59,8 +59,8 @@
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>;
rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>;
rgltr-min-voltage = <1800000 2800000 1056000 0 2800000>;
rgltr-max-voltage = <1800000 2800000 1056000 0 2800000>;
rgltr-load-current = <120000 80000 1200000 0 100000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -84,8 +84,8 @@
clock-rates = <19200000>;
};
eeprom_rear_aux: qcom,eeprom1 {
cell-index = <1>;
eeprom_rear_aux2: qcom,eeprom3 {
cell-index = <3>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
@ -139,8 +139,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <120000 80000 1200000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -164,16 +164,16 @@
clock-rates = <19200000>;
};
/*Rear Aux*/
qcom,cam-sensor1 {
cell-index = <1>;
/*Rear Aux2*/
qcom,cam-sensor3 {
cell-index = <3>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
led-flash-src = <&led_flash_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
cam_vdig-supply = <&L1P>;
@ -209,10 +209,10 @@
};
&cam_cci1 {
actuator_rear_aux2: qcom,actuator3 {
cell-index = <3>;
actuator_rear_aux: qcom,actuator1 {
cell-index = <1>;
compatible = "qcom,actuator";
cci-device = <1>;
cci-master= <0>;
cam_vaf-supply = <&L5P>;
regulator-names = "cam_vaf";
rgltr-cntrl-support;
@ -233,8 +233,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <0 80000 105000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -258,8 +258,8 @@
clock-rates = <24000000>;
};
eeprom_rear_aux2: qcom,eeprom3 {
cell-index = <3>;
eeprom_rear_aux: qcom,eeprom1 {
cell-index = <1>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
@ -312,8 +312,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <0 80000 105000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -337,17 +337,17 @@
clock-rates = <24000000>;
};
/*Rear Aux2*/
qcom,cam-sensor3 {
cell-index = <3>;
/*Rear Aux*/
qcom,cam-sensor1 {
cell-index = <1>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <2>;
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear_aux2>;
actuator-src = <&actuator_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
led-flash-src = <&led_flash_rear_aux>;
actuator-src = <&actuator_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
cam_vdig-supply = <&L1P>;

View file

@ -18,8 +18,8 @@
status = "ok"
};
led_flash_rear_aux2: qcom,camera-flash@2 {
cell-index = <2>;
led_flash_rear_aux2: qcom,camera-flash@3 {
cell-index = <3>;
compatible = "qcom,camera-flash";
flash-source = <&pm6150l_flash0 &pm6150l_flash1>;
torch-source = <&pm6150l_torch0 &pm6150l_torch1>;
@ -59,8 +59,8 @@
"cam_clk", "cam_vaf";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0 2800000>;
rgltr-max-voltage = <1800000 2800000 1050000 0 2800000>;
rgltr-min-voltage = <1800000 2800000 1056000 0 2800000>;
rgltr-max-voltage = <1800000 2800000 1056000 0 2800000>;
rgltr-load-current = <120000 80000 1200000 0 100000>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -84,8 +84,8 @@
clock-rates = <19200000>;
};
eeprom_rear_aux: qcom,eeprom1 {
cell-index = <1>;
eeprom_rear_aux2: qcom,eeprom3 {
cell-index = <3>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
@ -139,8 +139,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <120000 80000 1200000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -164,16 +164,16 @@
clock-rates = <19200000>;
};
/*Rear Aux*/
qcom,cam-sensor1 {
cell-index = <1>;
/*Rear Aux2*/
qcom,cam-sensor3 {
cell-index = <3>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
led-flash-src = <&led_flash_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L3P>;
cam_vdig-supply = <&L1P>;
@ -209,10 +209,10 @@
};
&cam_cci1 {
actuator_rear_aux2: qcom,actuator3 {
cell-index = <3>;
actuator_rear_aux: qcom,actuator1 {
cell-index = <1>;
compatible = "qcom,actuator";
cci-device = <1>;
cci-master = <0>;
cam_vaf-supply = <&L5P>;
regulator-names = "cam_vaf";
rgltr-cntrl-support;
@ -233,8 +233,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <0 80000 105000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -258,8 +258,8 @@
clock-rates = <24000000>;
};
eeprom_rear_aux2: qcom,eeprom3 {
cell-index = <3>;
eeprom_rear_aux: qcom,eeprom1 {
cell-index = <1>;
compatible = "qcom,eeprom";
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
@ -312,8 +312,8 @@
"cam_clk";
rgltr-cntrl-support;
pwm-switch;
rgltr-min-voltage = <1800000 2800000 1050000 0>;
rgltr-max-voltage = <1800000 2800000 1050000 0>;
rgltr-min-voltage = <1800000 2800000 1056000 0>;
rgltr-max-voltage = <1800000 2800000 1056000 0>;
rgltr-load-current = <0 80000 105000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -337,17 +337,17 @@
clock-rates = <24000000>;
};
/*Rear Aux2*/
qcom,cam-sensor3 {
cell-index = <3>;
/*Rear Aux*/
qcom,cam-sensor1 {
cell-index = <1>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <2>;
sensor-position-roll = <270>;
sensor-position-pitch = <0>;
sensor-position-yaw = <180>;
led-flash-src = <&led_flash_rear_aux2>;
actuator-src = <&actuator_rear_aux2>;
eeprom-src = <&eeprom_rear_aux2>;
led-flash-src = <&led_flash_rear_aux>;
actuator-src = <&actuator_rear_aux>;
eeprom-src = <&eeprom_rear_aux>;
cam_vio-supply = <&L6P>;
cam_vana-supply = <&L7P>;
cam_vdig-supply = <&L1P>;

View file

@ -148,7 +148,7 @@
cam_cci0: qcom,cci0 {
cell-index = <0>;
compatible = "qcom,cci";
compatible = "qcom,cci", "simple-bus";
reg = <0x05C1B000 0x1000>;
reg-names = "cci";
reg-cam-base = <0x1B000>;
@ -241,7 +241,7 @@
cam_cci1: qcom,cci1 {
cell-index = <1>;
compatible = "qcom,cci";
compatible = "qcom,cci", "simple-bus";
reg = <0x05C1C000 0x1000>;
reg-names = "cci";
reg-cam-base = <0x1C000>;