evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-11 06:47:58 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1e059e00bf
8 changed files with 314 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/boot/dts/qcom/msm-pm660l.dtsi
View file

@ -380,9 +380,6 @@
qcom,led-name = "led:switch_1"; qcom,led-name = "led:switch_1";
qcom,led-mask = <4>; qcom,led-mask = <4>;
qcom,default-led-trigger = "switch1_trigger"; qcom,default-led-trigger = "switch1_trigger";
pinctrl-names = "led_enable","led_disable";
pinctrl-0 = <&led_enable>;
pinctrl-1 = <&led_disable>;
}; };
}; };

3
arch/arm/boot/dts/qcom/msm-pmi8998.dtsi
View file

@ -762,9 +762,6 @@
qcom,led-name = "led:switch_1"; qcom,led-name = "led:switch_1";
qcom,led-mask = <4>; qcom,led-mask = <4>;
qcom,default-led-trigger = "switch1_trigger"; qcom,default-led-trigger = "switch1_trigger";
pinctrl-names = "led_enable","led_disable";
pinctrl-0 = <&led_enable>;
pinctrl-1 = <&led_disable>;
}; };
}; };
}; };

54
arch/arm/boot/dts/qcom/msm8998-camera-sensor-mtp.dtsi
View file

@ -334,19 +334,22 @@
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active pinctrl-0 = <&cam_sensor_mclk1_active
&cam_sensor_front_active>; &cam_sensor_front_active &led_enable>;
pinctrl-1 = <&cam_sensor_mclk1_suspend pinctrl-1 = <&cam_sensor_mclk1_suspend
&cam_sensor_front_suspend>; &cam_sensor_front_suspend &led_disable>;
gpios = <&tlmm 14 0>, gpios = <&tlmm 14 0>,
<&tlmm 28 0>, <&tlmm 28 0>,
<&pm8998_gpios 9 0>; <&pm8998_gpios 9 0>,
<&tlmm 21 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-vdig = <2>;
qcom,gpio-req-tbl-num = <0 1 2>; qcom,gpio-flash-en = <3>;
qcom,gpio-req-tbl-flags = <1 0 0>; qcom,gpio-req-tbl-num = <0 1 2 3>;
qcom,gpio-req-tbl-flags = <1 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK2", qcom,gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2", "CAM_RESET2",
"CAM_VDIG"; "CAM_VDIG",
"FLASH_EN";
qcom,sensor-position = <1>; qcom,sensor-position = <1>;
qcom,sensor-mode = <0>; qcom,sensor-mode = <0>;
qcom,cci-master = <1>; qcom,cci-master = <1>;
@ -356,6 +359,45 @@
clock-names = "cam_src_clk", "cam_clk"; clock-names = "cam_src_clk", "cam_clk";
qcom,clock-rates = <24000000 0>; qcom,clock-rates = <24000000 0>;
}; };
qcom,camera@3 {
cell-index = <3>;
compatible = "qcom,camera";
reg = <0x03>;
qcom,csiphy-sd-index = <1>;
qcom,csid-sd-index = <1>;
qcom,mount-angle = <270>;
qcom,led-flash-src = <&led_flash1>;
cam_vio-supply = <&pm8998_lvs1>;
cam_vana-supply = <&pm8998_l22>;
cam_vdig-supply = <&pm8998_s3>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage =
<0 2864000 1352000>;
qcom,cam-vreg-max-voltage =
<0 2864000 1352000>;
qcom,cam-vreg-op-mode = <0 80000 105000>;
qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk3_active
&cam_sensor_front_iris_active>;
pinctrl-1 = <&cam_sensor_mclk3_suspend
&cam_sensor_front_iris_suspend>;
gpios = <&tlmm 16 0>,
<&tlmm 23 0>;
qcom,gpio-reset = <1>;
qcom,gpio-req-tbl-num = <0 1>;
qcom,gpio-req-tbl-flags = <1 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK3",
"CAM_RESET3";
qcom,sensor-position = <1>;
qcom,sensor-mode = <0>;
qcom,cci-master = <1>;
clocks = <&clock_mmss clk_mclk3_clk_src>,
<&clock_mmss clk_mmss_camss_mclk3_clk>;
clock-names = "cam_src_clk", "cam_clk";
qcom,clock-rates = <24000000 0>;
};
}; };
&pm8998_gpios { &pm8998_gpios {
gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */ gpio@c800 { /* GPIO 9 - CAMERA SENSOR 2 VDIG */

12
arch/arm/boot/dts/qcom/msm8998-interposer-camera-sensor-mtp.dtsi
View file

@ -11,6 +11,12 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
&soc {
/delete-node/qcom,camera-flash@0;
/delete-node/qcom,camera-flash@1;
/delete-node/gpio-regulator@0;
};
&soc { &soc {
tlmm: pinctrl@03400000 { tlmm: pinctrl@03400000 {
cam_sensor_rear_active: cam_sensor_rear_active { cam_sensor_rear_active: cam_sensor_rear_active {
@ -132,19 +138,17 @@
}; };
}; };
&soc {
/delete-node/gpio-regulator@0;
};
&cci { &cci {
/delete-node/qcom,camera@0; /delete-node/qcom,camera@0;
/delete-node/qcom,camera@1; /delete-node/qcom,camera@1;
/delete-node/qcom,camera@2; /delete-node/qcom,camera@2;
/delete-node/qcom,camera@3;
/delete-node/qcom,eeprom@0; /delete-node/qcom,eeprom@0;
/delete-node/qcom,eeprom@1; /delete-node/qcom,eeprom@1;
/delete-node/qcom,eeprom@2; /delete-node/qcom,eeprom@2;
/delete-node/qcom,actuator@0; /delete-node/qcom,actuator@0;
/delete-node/qcom,actuator@1; /delete-node/qcom,actuator@1;
/delete-node/qcom,tof@0;
/delete-node/qcom,ois@0; /delete-node/qcom,ois@0;
}; };

12
arch/arm/boot/dts/qcom/msm8998-interposer-camera-sensor-qrd.dtsi
View file

@ -11,6 +11,12 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
&soc {
/delete-node/qcom,camera-flash@0;
/delete-node/qcom,camera-flash@1;
/delete-node/gpio-regulator@0;
};
&soc { &soc {
tlmm: pinctrl@03400000 { tlmm: pinctrl@03400000 {
cam_sensor_rear_active: cam_sensor_rear_active { cam_sensor_rear_active: cam_sensor_rear_active {
@ -170,19 +176,17 @@
}; };
}; };
&soc {
/delete-node/gpio-regulator@0;
};
&cci { &cci {
/delete-node/qcom,camera@0; /delete-node/qcom,camera@0;
/delete-node/qcom,camera@1; /delete-node/qcom,camera@1;
/delete-node/qcom,camera@2; /delete-node/qcom,camera@2;
/delete-node/qcom,camera@3;
/delete-node/qcom,eeprom@0; /delete-node/qcom,eeprom@0;
/delete-node/qcom,eeprom@1; /delete-node/qcom,eeprom@1;
/delete-node/qcom,eeprom@2; /delete-node/qcom,eeprom@2;
/delete-node/qcom,actuator@0; /delete-node/qcom,actuator@0;
/delete-node/qcom,actuator@1; /delete-node/qcom,actuator@1;
/delete-node/qcom,tof@0;
/delete-node/qcom,ois@0; /delete-node/qcom,ois@0;
}; };

71
arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi
View file

@ -996,7 +996,7 @@
cam_sensor_mclk0_active: cam_sensor_mclk0_active { cam_sensor_mclk0_active: cam_sensor_mclk0_active {
/* MCLK0 */ /* MCLK0 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio13"; pins = "gpio13";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1011,7 +1011,7 @@
cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend {
/* MCLK0 */ /* MCLK0 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio13"; pins = "gpio13";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1305,7 +1305,7 @@
cam_sensor_mclk1_active: cam_sensor_mclk1_active { cam_sensor_mclk1_active: cam_sensor_mclk1_active {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio14"; pins = "gpio14";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1320,7 +1320,7 @@
cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio14"; pins = "gpio14";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1332,6 +1332,36 @@
}; };
}; };
cam_sensor_mclk3_active: cam_sensor_mclk3_active {
/* MCLK3 */
mux {
/* CLK */
pins = "gpio16";
function = "cam_mclk";
};
config {
pins = "gpio16";
bias-disable; /* No PULL */
drive-strength = <2>; /* 2 MA */
};
};
cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend {
/* MCLK3 */
mux {
/* CLK */
pins = "gpio16";
function = "cam_mclk";
};
config {
pins = "gpio16";
bias-pull-down; /* PULL DOWN */
drive-strength = <2>; /* 2 MA */
};
};
cam_sensor_rear2_active: cam_sensor_rear2_active { cam_sensor_rear2_active: cam_sensor_rear2_active {
/* RESET, STANDBY */ /* RESET, STANDBY */
mux { mux {
@ -1468,7 +1498,7 @@
cam_sensor_mclk2_active: cam_sensor_mclk2_active { cam_sensor_mclk2_active: cam_sensor_mclk2_active {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio15"; pins = "gpio15";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1483,7 +1513,7 @@
cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio15"; pins = "gpio15";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1509,6 +1539,21 @@
}; };
}; };
cam_sensor_front_iris_active: cam_sensor_front_iris_active {
/* RESET */
mux {
pins = "gpio23";
function = "gpio";
};
config {
pins = "gpio23";
bias-disable; /* No PULL */
drive-strength = <2>; /* 2 MA */
};
};
blsp2_uart1_active: blsp2_uart1_active { blsp2_uart1_active: blsp2_uart1_active {
mux { mux {
pins = "gpio53", "gpio54", "gpio55", "gpio56"; pins = "gpio53", "gpio54", "gpio55", "gpio56";
@ -1575,6 +1620,20 @@
}; };
}; };
cam_sensor_front_iris_suspend: cam_sensor_front_iris_suspend {
/* RESET */
mux {
pins = "gpio23";
function = "gpio";
};
config {
pins = "gpio23";
bias-disable; /* No PULL */
drive-strength = <2>; /* 2 MA */
};
};
pmx_mdss: pmx_mdss { pmx_mdss: pmx_mdss {
mdss_dsi_active: mdss_dsi_active { mdss_dsi_active: mdss_dsi_active {
mux { mux {

206
arch/arm/boot/dts/qcom/sdm660-camera-sensor-mtp.dtsi
View file

@ -29,6 +29,36 @@
qcom,switch-source = <&pm660l_switch1>; qcom,switch-source = <&pm660l_switch1>;
status = "ok"; status = "ok";
}; };
cam_avdd_gpio_regulator: cam_avdd_fixed_regulator {
compatible = "regulator-fixed";
regulator-name = "cam_avdd_gpio_regulator";
regulator-min-microvolt = <3600000>;
regulator-max-microvolt = <3600000>;
enable-active-high;
gpio = <&tlmm 51 0>;
vin-supply = <&pm660l_bob>;
};
cam_dvdd_gpio_regulator: cam_dvdd_fixed_regulator {
compatible = "regulator-fixed";
regulator-name = "cam_dvdd_gpio_regulator";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
enable-active-high;
gpio = <&pm660l_gpios 3 0>;
vin-supply = <&pm660_s5>;
};
cam_rear_dvdd_gpio_regulator: cam_rear_dvdd_fixed_regulator {
compatible = "regulator-fixed";
regulator-name = "cam_rear_dvdd_gpio_regulator";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
enable-active-high;
gpio = <&pm660l_gpios 4 0>;
vin-supply = <&pm660_s5>;
};
}; };
&cci { &cci {
@ -98,12 +128,12 @@
reg = <0>; reg = <0>;
compatible = "qcom,eeprom"; compatible = "qcom,eeprom";
cam_vio-supply = <&pm660_l11>; cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&pm660l_bob>; cam_vana-supply = <&cam_avdd_gpio_regulator>;
cam_vdig-supply = <&pm660_s5>; cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig"; qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>; qcom,cam-vreg-min-voltage = <1780000 0 0>;
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>; qcom,cam-vreg-max-voltage = <1950000 0 0>;
qcom,cam-vreg-op-mode = <105000 80000 105000>; qcom,cam-vreg-op-mode = <105000 0 0>;
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active pinctrl-0 = <&cam_sensor_mclk0_active
@ -114,19 +144,13 @@
&cam_actuator_vaf_suspend>; &cam_actuator_vaf_suspend>;
gpios = <&tlmm 32 0>, gpios = <&tlmm 32 0>,
<&tlmm 46 0>, <&tlmm 46 0>,
<&pm660l_gpios 4 0>,
<&tlmm 51 0>,
<&tlmm 50 0>; <&tlmm 50 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-vaf = <2>;
qcom,gpio-vana = <3>; qcom,gpio-req-tbl-num = <0 1 2>;
qcom,gpio-vaf = <4>; qcom,gpio-req-tbl-flags = <1 0 0>;
qcom,gpio-req-tbl-num = <0 1 2 3 4>;
qcom,gpio-req-tbl-flags = <1 0 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK0", qcom,gpio-req-tbl-label = "CAMIF_MCLK0",
"CAM_RESET0", "CAM_RESET0",
"CAM_VDIG",
"CAM_VANA",
"CAM_VAF"; "CAM_VAF";
qcom,sensor-position = <0>; qcom,sensor-position = <0>;
qcom,sensor-mode = <0>; qcom,sensor-mode = <0>;
@ -143,12 +167,12 @@
reg = <0x1>; reg = <0x1>;
compatible = "qcom,eeprom"; compatible = "qcom,eeprom";
cam_vio-supply = <&pm660_l11>; cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&pm660l_bob>; cam_vana-supply = <&cam_avdd_gpio_regulator>;
cam_vdig-supply = <&pm660_s5>; cam_vdig-supply = <&cam_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig"; qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>; qcom,cam-vreg-min-voltage = <1780000 0 0>;
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>; qcom,cam-vreg-max-voltage = <1950000 0 0>;
qcom,cam-vreg-op-mode = <105000 80000 105000>; qcom,cam-vreg-op-mode = <105000 0 0>;
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active pinctrl-0 = <&cam_sensor_mclk2_active
@ -156,18 +180,12 @@
pinctrl-1 = <&cam_sensor_mclk2_suspend pinctrl-1 = <&cam_sensor_mclk2_suspend
&cam_sensor_rear2_suspend>; &cam_sensor_rear2_suspend>;
gpios = <&tlmm 34 0>, gpios = <&tlmm 34 0>,
<&tlmm 48 0>, <&tlmm 48 0>;
<&pm660l_gpios 3 0>,
<&tlmm 51 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-req-tbl-num = <0 1>;
qcom,gpio-vana = <3>; qcom,gpio-req-tbl-flags = <1 0>;
qcom,gpio-req-tbl-num = <0 1 2 3>;
qcom,gpio-req-tbl-flags = <1 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK", qcom,gpio-req-tbl-label = "CAMIF_MCLK",
"CAM_RESET", "CAM_RESET";
"CAM_VDIG",
"CAM_VANA";
qcom,sensor-position = <0>; qcom,sensor-position = <0>;
qcom,sensor-mode = <0>; qcom,sensor-mode = <0>;
qcom,cci-master = <1>; qcom,cci-master = <1>;
@ -184,11 +202,11 @@
compatible = "qcom,eeprom"; compatible = "qcom,eeprom";
cam_vio-supply = <&pm660_l11>; cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&pm660l_bob>; cam_vana-supply = <&pm660l_bob>;
cam_vdig-supply = <&pm660_s5>; cam_vdig-supply = <&cam_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig"; qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>; qcom,cam-vreg-min-voltage = <1780000 3300000 0>;
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>; qcom,cam-vreg-max-voltage = <1950000 3600000 0>;
qcom,cam-vreg-op-mode = <105000 80000 105000>; qcom,cam-vreg-op-mode = <105000 80000 0>;
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active pinctrl-0 = <&cam_sensor_mclk1_active
@ -199,18 +217,15 @@
&cam_actuator_vaf_suspend>; &cam_actuator_vaf_suspend>;
gpios = <&tlmm 33 0>, gpios = <&tlmm 33 0>,
<&tlmm 47 0>, <&tlmm 47 0>,
<&pm660_gpios 3 0>,
<&tlmm 44 0>, <&tlmm 44 0>,
<&tlmm 50 0>; <&tlmm 50 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-vana = <2>;
qcom,gpio-vana = <3>; qcom,gpio-vaf = <3>;
qcom,gpio-vaf = <4>; qcom,gpio-req-tbl-num = <0 1 2 3>;
qcom,gpio-req-tbl-num = <0 1 2 3 4>; qcom,gpio-req-tbl-flags = <1 0 0 0>;
qcom,gpio-req-tbl-flags = <1 0 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK2", qcom,gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2", "CAM_RESET2",
"CAM_VDIG",
"CAM_VANA", "CAM_VANA",
"CAM_VAF"; "CAM_VAF";
qcom,sensor-position = <1>; qcom,sensor-position = <1>;
@ -235,12 +250,12 @@
qcom,ois-src = <&ois0>; qcom,ois-src = <&ois0>;
qcom,eeprom-src = <&eeprom0>; qcom,eeprom-src = <&eeprom0>;
cam_vio-supply = <&pm660_l11>; cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&pm660l_bob>; cam_vana-supply = <&cam_avdd_gpio_regulator>;
cam_vdig-supply = <&pm660_s5>; cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig"; qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>; qcom,cam-vreg-min-voltage = <1780000 0 0>;
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>; qcom,cam-vreg-max-voltage = <1950000 0 0>;
qcom,cam-vreg-op-mode = <105000 80000 105000>; qcom,cam-vreg-op-mode = <105000 0 0>;
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk0_active pinctrl-0 = <&cam_sensor_mclk0_active
@ -248,18 +263,12 @@
pinctrl-1 = <&cam_sensor_mclk0_suspend pinctrl-1 = <&cam_sensor_mclk0_suspend
&cam_sensor_rear_suspend>; &cam_sensor_rear_suspend>;
gpios = <&tlmm 32 0>, gpios = <&tlmm 32 0>,
<&tlmm 46 0>, <&tlmm 46 0>;
<&pm660l_gpios 4 0>,
<&tlmm 51 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-req-tbl-num = <0 1>;
qcom,gpio-vana = <3>; qcom,gpio-req-tbl-flags = <1 0>;
qcom,gpio-req-tbl-num = <0 1 2 3>;
qcom,gpio-req-tbl-flags = <1 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK0", qcom,gpio-req-tbl-label = "CAMIF_MCLK0",
"CAM_RESET0", "CAM_RESET0";
"CAM_VDIG",
"CAM_VANA";
qcom,sensor-position = <0>; qcom,sensor-position = <0>;
qcom,sensor-mode = <0>; qcom,sensor-mode = <0>;
qcom,cci-master = <0>; qcom,cci-master = <0>;
@ -280,12 +289,12 @@
qcom,actuator-src = <&actuator1>; qcom,actuator-src = <&actuator1>;
qcom,eeprom-src = <&eeprom1>; qcom,eeprom-src = <&eeprom1>;
cam_vio-supply = <&pm660_l11>; cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&pm660l_bob>; cam_vana-supply = <&cam_avdd_gpio_regulator>;
cam_vdig-supply = <&pm660_s5>; cam_vdig-supply = <&cam_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig"; qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>; qcom,cam-vreg-min-voltage = <1780000 0 0>;
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>; qcom,cam-vreg-max-voltage = <1950000 0 0>;
qcom,cam-vreg-op-mode = <105000 80000 105000>; qcom,cam-vreg-op-mode = <105000 0 0>;
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk2_active pinctrl-0 = <&cam_sensor_mclk2_active
@ -293,18 +302,12 @@
pinctrl-1 = <&cam_sensor_mclk2_suspend pinctrl-1 = <&cam_sensor_mclk2_suspend
&cam_sensor_rear2_suspend>; &cam_sensor_rear2_suspend>;
gpios = <&tlmm 34 0>, gpios = <&tlmm 34 0>,
<&tlmm 48 0>, <&tlmm 48 0>;
<&pm660l_gpios 3 0>,
<&tlmm 51 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-req-tbl-num = <0 1>;
qcom,gpio-vana = <3>; qcom,gpio-req-tbl-flags = <1 0>;
qcom,gpio-req-tbl-num = <0 1 2 3>;
qcom,gpio-req-tbl-flags = <1 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK", qcom,gpio-req-tbl-label = "CAMIF_MCLK",
"CAM_RESET", "CAM_RESET";
"CAM_VDIG",
"CAM_VANA";
qcom,sensor-position = <0>; qcom,sensor-position = <0>;
qcom,sensor-mode = <0>; qcom,sensor-mode = <0>;
qcom,cci-master = <1>; qcom,cci-master = <1>;
@ -325,12 +328,12 @@
qcom,actuator-src = <&actuator2>; qcom,actuator-src = <&actuator2>;
qcom,eeprom-src = <&eeprom2>; qcom,eeprom-src = <&eeprom2>;
cam_vio-supply = <&pm660_l11>; cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&pm660l_bob>; cam_vana-supply = <&cam_avdd_gpio_regulator>;
cam_vdig-supply = <&pm660_s5>; cam_vdig-supply = <&cam_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig"; qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>; qcom,cam-vreg-min-voltage = <1780000 0 0>;
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>; qcom,cam-vreg-max-voltage = <1950000 0 0>;
qcom,cam-vreg-op-mode = <105000 80000 105000>; qcom,cam-vreg-op-mode = <105000 0 0>;
qcom,gpio-no-mux = <0>; qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk1_active pinctrl-0 = <&cam_sensor_mclk1_active
@ -338,18 +341,12 @@
pinctrl-1 = <&cam_sensor_mclk1_suspend pinctrl-1 = <&cam_sensor_mclk1_suspend
&cam_sensor_front_suspend>; &cam_sensor_front_suspend>;
gpios = <&tlmm 33 0>, gpios = <&tlmm 33 0>,
<&tlmm 47 0>, <&tlmm 47 0>;
<&pm660l_gpios 3 0>,
<&tlmm 51 0>;
qcom,gpio-reset = <1>; qcom,gpio-reset = <1>;
qcom,gpio-vdig = <2>; qcom,gpio-req-tbl-num = <0 1>;
qcom,gpio-vana = <3>; qcom,gpio-req-tbl-flags = <1 0>;
qcom,gpio-req-tbl-num = <0 1 2 3>;
qcom,gpio-req-tbl-flags = <1 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK2", qcom,gpio-req-tbl-label = "CAMIF_MCLK2",
"CAM_RESET2", "CAM_RESET2";
"CAM_VDIG",
"CAM_VANA";
qcom,sensor-position = <1>; qcom,sensor-position = <1>;
qcom,sensor-mode = <0>; qcom,sensor-mode = <0>;
qcom,cci-master = <1>; qcom,cci-master = <1>;
@ -359,6 +356,45 @@
clock-names = "cam_src_clk", "cam_clk"; clock-names = "cam_src_clk", "cam_clk";
qcom,clock-rates = <24000000 0>; qcom,clock-rates = <24000000 0>;
}; };
qcom,camera@3 {
cell-index = <3>;
compatible = "qcom,camera";
reg = <0x03>;
qcom,csiphy-sd-index = <1>;
qcom,csid-sd-index = <1>;
qcom,mount-angle = <90>;
qcom,led-flash-src = <&led_flash1>;
qcom,actuator-src = <&actuator2>;
qcom,eeprom-src = <&eeprom2>;
cam_vio-supply = <&pm660_l11>;
cam_vana-supply = <&cam_avdd_gpio_regulator>;
cam_vdig-supply = <&cam_dvdd_gpio_regulator>;
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
qcom,cam-vreg-min-voltage = <1780000 0 0>;
qcom,cam-vreg-max-voltage = <1950000 0 0>;
qcom,cam-vreg-op-mode = <105000 0 0>;
qcom,gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_sensor_mclk3_active
&cam_sensor_front_iris_active>;
pinctrl-1 = <&cam_sensor_mclk3_suspend
&cam_sensor_front_iris_suspend>;
gpios = <&tlmm 35 0>,
<&tlmm 52 0>;
qcom,gpio-reset = <1>;
qcom,gpio-req-tbl-num = <0 1>;
qcom,gpio-req-tbl-flags = <1 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK3",
"CAM_RESET3";
qcom,sensor-position = <1>;
qcom,sensor-mode = <0>;
qcom,cci-master = <1>;
clocks = <&clock_mmss MCLK3_CLK_SRC>,
<&clock_mmss MMSS_CAMSS_MCLK3_CLK>;
clock-names = "cam_src_clk", "cam_clk";
qcom,clock-rates = <24000000 0>;
};
}; };
&pm660l_gpios { &pm660l_gpios {

70
arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi
View file

@ -1104,7 +1104,7 @@
cam_sensor_mclk0_active: cam_sensor_mclk0_active { cam_sensor_mclk0_active: cam_sensor_mclk0_active {
/* MCLK0 */ /* MCLK0 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio32"; pins = "gpio32";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1119,7 +1119,7 @@
cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend { cam_sensor_mclk0_suspend: cam_sensor_mclk0_suspend {
/* MCLK0 */ /* MCLK0 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio32"; pins = "gpio32";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1162,7 +1162,7 @@
cam_sensor_mclk1_active: cam_sensor_mclk1_active { cam_sensor_mclk1_active: cam_sensor_mclk1_active {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio33"; pins = "gpio33";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1177,7 +1177,7 @@
cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend { cam_sensor_mclk1_suspend: cam_sensor_mclk1_suspend {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio33"; pins = "gpio33";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1219,7 +1219,7 @@
cam_sensor_mclk2_active: cam_sensor_mclk2_active { cam_sensor_mclk2_active: cam_sensor_mclk2_active {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio34"; pins = "gpio34";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1234,7 +1234,7 @@
cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend { cam_sensor_mclk2_suspend: cam_sensor_mclk2_suspend {
/* MCLK1 */ /* MCLK1 */
mux { mux {
/* CLK, DATA */ /* CLK */
pins = "gpio34"; pins = "gpio34";
function = "cam_mclk"; function = "cam_mclk";
}; };
@ -1274,6 +1274,64 @@
}; };
}; };
cam_sensor_mclk3_active: cam_sensor_mclk3_active {
/* MCLK3 */
mux {
/* CLK */
pins = "gpio35";
function = "cam_mclk";
};
config {
pins = "gpio35";
bias-disable; /* No PULL */
drive-strength = <2>; /* 2 MA */
};
};
cam_sensor_mclk3_suspend: cam_sensor_mclk3_suspend {
/* MCLK3 */
mux {
/* CLK */
pins = "gpio35";
function = "cam_mclk";
};
config {
pins = "gpio35";
bias-pull-down; /* PULL DOWN */
drive-strength = <2>; /* 2 MA */
};
};
cam_sensor_front_iris_active: cam_sensor_front_iris_active {
/* RESET */
mux {
pins = "gpio52";
function = "gpio";
};
config {
pins = "gpio52";
bias-disable; /* No PULL */
drive-strength = <2>; /* 2 MA */
};
};
cam_sensor_front_iris_suspend: cam_sensor_front_iris_suspend {
/* RESET */
mux {
pins = "gpio52";
function = "gpio";
};
config {
pins = "gpio52";
bias-disable; /* No PULL */
drive-strength = <2>; /* 2 MA */
};
};
/* HS UART CONFIGURATION */ /* HS UART CONFIGURATION */
blsp1_uart1_active: blsp1_uart1_active { blsp1_uart1_active: blsp1_uart1_active {
mux { mux {