Merge "ARM: dts: msm: Add bringup fixes for Lahaina" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2020-02-03 14:11:29 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1023dd543c
3 changed files with 19 additions and 19 deletions

View file

@ -132,7 +132,7 @@
};
qcom,cam-sensor0 {
cell-index = <0>;
cell-index = <5>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <0>;
sensor-position-roll = <90>;
@ -174,7 +174,7 @@
};
qcom,cam-sensor1 {
cell-index = <1>;
cell-index = <4>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <90>;
@ -201,8 +201,8 @@
&cam_sensor_active_rst1>;
pinctrl-1 = <&cam_sensor_mclk1_suspend
&cam_sensor_suspend_rst1>;
gpios = <&tlmm 100 0>,
<&tlmm 17 0>;
gpios = <&tlmm 101 0>,
<&tlmm 16 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
@ -217,7 +217,7 @@
};
qcom,cam-sensor3 {
cell-index = <3>;
cell-index = <0>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <3>;
eeprom-src = <&eeprom_tof2>;
@ -270,7 +270,7 @@
rgltr-load-current = <103000>;
};
eeprom_triple_uw: qcom,eeprom3 {
eeprom_triple_uw: qcom,eeprom2 {
cell-index = <2>;
compatible = "qcom,eeprom";
cam_vio-supply = <&pm8008j_l3>;
@ -371,7 +371,7 @@
};
qcom,cam-sensor2 {
cell-index = <2>;
cell-index = <6>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <2>;
sensor-position-roll = <90>;
@ -413,7 +413,7 @@
};
qcom,cam-sensor4 {
cell-index = <4>;
cell-index = <3>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <4>;
eeprom-src = <&eeprom_tof1>;
@ -449,7 +449,7 @@
};
qcom,cam-sensor5 {
cell-index = <5>;
cell-index = <2>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <5>;
sensor-position-roll = <270>;

View file

@ -132,7 +132,7 @@
};
qcom,cam-sensor0 {
cell-index = <0>;
cell-index = <5>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <0>;
sensor-position-roll = <90>;
@ -174,7 +174,7 @@
};
qcom,cam-sensor1 {
cell-index = <1>;
cell-index = <4>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <1>;
sensor-position-roll = <90>;
@ -201,8 +201,8 @@
&cam_sensor_active_rst1>;
pinctrl-1 = <&cam_sensor_mclk1_suspend
&cam_sensor_suspend_rst1>;
gpios = <&tlmm 100 0>,
<&tlmm 17 0>;
gpios = <&tlmm 101 0>,
<&tlmm 16 0>;
gpio-reset = <1>;
gpio-req-tbl-num = <0 1>;
gpio-req-tbl-flags = <1 0>;
@ -217,7 +217,7 @@
};
qcom,cam-sensor3 {
cell-index = <3>;
cell-index = <0>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <3>;
eeprom-src = <&eeprom_tof2>;
@ -270,7 +270,7 @@
rgltr-load-current = <103000>;
};
eeprom_triple_uw: qcom,eeprom3 {
eeprom_triple_uw: qcom,eeprom2 {
cell-index = <2>;
compatible = "qcom,eeprom";
cam_vio-supply = <&pm8008j_l3>;
@ -371,7 +371,7 @@
};
qcom,cam-sensor2 {
cell-index = <2>;
cell-index = <6>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <2>;
sensor-position-roll = <90>;
@ -413,7 +413,7 @@
};
qcom,cam-sensor4 {
cell-index = <4>;
cell-index = <3>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <4>;
eeprom-src = <&eeprom_tof1>;
@ -449,7 +449,7 @@
};
qcom,cam-sensor5 {
cell-index = <5>;
cell-index = <2>;
compatible = "qcom,cam-sensor";
csiphy-sd-index = <5>;
sensor-position-roll = <270>;

View file

@ -935,7 +935,7 @@
traffic-data =
<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;
traffic-transaction-type =
<CAM_CPAS_TRANSACTION_READ>;
<CAM_CPAS_TRANSACTION_WRITE>;
constituent-paths =
<CAM_CPAS_PATH_DATA_IFE_RDI0
CAM_CPAS_PATH_DATA_IFE_RDI1