Merge "ARM: dts: msm: Add iris support on sdm630"
This commit is contained in:
Linux Build Service Account
Gerrit - the friendly Code Review server
commit
7217c5a9c1
1 changed files with 122 additions and 85 deletions
|
|
@ -29,6 +29,36 @@
|
|||
qcom,switch-source = <&pm660l_switch1>;
|
||||
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 {
|
||||
|
|
@ -89,14 +119,14 @@
|
|||
reg = <0>;
|
||||
compatible = "qcom,eeprom";
|
||||
cam_vio-supply = <&pm660_l11>;
|
||||
cam_vana-supply = <&pm660l_bob>;
|
||||
cam_vdig-supply = <&pm660_s5>;
|
||||
cam_vana-supply = <&cam_avdd_gpio_regulator>;
|
||||
cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;
|
||||
cam_vaf-supply = <&pm660l_l8>;
|
||||
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig",
|
||||
"cam_vaf";
|
||||
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000 2800000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000 3400000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 105000 100000>;
|
||||
qcom,cam-vreg-min-voltage = <1780000 0 0 2800000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 0 0 3400000>;
|
||||
qcom,cam-vreg-op-mode = <105000 0 0 100000>;
|
||||
qcom,gpio-no-mux = <0>;
|
||||
pinctrl-names = "cam_default", "cam_suspend";
|
||||
pinctrl-0 = <&cam_sensor_mclk0_active
|
||||
|
|
@ -104,18 +134,12 @@
|
|||
pinctrl-1 = <&cam_sensor_mclk0_suspend
|
||||
&cam_sensor_rear_suspend>;
|
||||
gpios = <&tlmm 32 0>,
|
||||
<&tlmm 46 0>,
|
||||
<&pm660l_gpios 4 0>,
|
||||
<&tlmm 51 0>;
|
||||
<&tlmm 46 0>;
|
||||
qcom,gpio-reset = <1>;
|
||||
qcom,gpio-vdig = <2>;
|
||||
qcom,gpio-vana = <3>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2 3>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0 0>;
|
||||
qcom,gpio-req-tbl-num = <0 1>;
|
||||
qcom,gpio-req-tbl-flags = <1 0>;
|
||||
qcom,gpio-req-tbl-label = "CAMIF_MCLK0",
|
||||
"CAM_RESET0",
|
||||
"CAM_VDIG",
|
||||
"CAM_VANA";
|
||||
"CAM_RESET0";
|
||||
qcom,sensor-position = <0>;
|
||||
qcom,sensor-mode = <0>;
|
||||
qcom,cci-master = <0>;
|
||||
|
|
@ -131,14 +155,14 @@
|
|||
reg = <0x1>;
|
||||
compatible = "qcom,eeprom";
|
||||
cam_vio-supply = <&pm660_l11>;
|
||||
cam_vana-supply = <&pm660l_bob>;
|
||||
cam_vdig-supply = <&pm660_s5>;
|
||||
cam_vana-supply = <&cam_avdd_gpio_regulator>;
|
||||
cam_vdig-supply = <&cam_dvdd_gpio_regulator>;
|
||||
cam_vaf-supply = <&pm660l_l8>;
|
||||
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig",
|
||||
"cam_vaf";
|
||||
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000 2800000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000 3400000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 105000 100000>;
|
||||
qcom,cam-vreg-min-voltage = <1780000 0 0 2800000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 0 0 3400000>;
|
||||
qcom,cam-vreg-op-mode = <105000 0 0 100000>;
|
||||
qcom,gpio-no-mux = <0>;
|
||||
pinctrl-names = "cam_default", "cam_suspend";
|
||||
pinctrl-0 = <&cam_sensor_mclk2_active
|
||||
|
|
@ -146,18 +170,12 @@
|
|||
pinctrl-1 = <&cam_sensor_mclk2_suspend
|
||||
&cam_sensor_rear2_suspend>;
|
||||
gpios = <&tlmm 34 0>,
|
||||
<&tlmm 48 0>,
|
||||
<&pm660l_gpios 3 0>,
|
||||
<&tlmm 51 0>;
|
||||
<&tlmm 48 0>;
|
||||
qcom,gpio-reset = <1>;
|
||||
qcom,gpio-vdig = <2>;
|
||||
qcom,gpio-vana = <3>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2 3>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0 0>;
|
||||
qcom,gpio-req-tbl-num = <0 1>;
|
||||
qcom,gpio-req-tbl-flags = <1 0>;
|
||||
qcom,gpio-req-tbl-label = "CAMIF_MCLK",
|
||||
"CAM_RESET",
|
||||
"CAM_VDIG",
|
||||
"CAM_VANA";
|
||||
"CAM_RESET";
|
||||
qcom,sensor-position = <0>;
|
||||
qcom,sensor-mode = <0>;
|
||||
qcom,cci-master = <1>;
|
||||
|
|
@ -174,12 +192,12 @@
|
|||
compatible = "qcom,eeprom";
|
||||
cam_vio-supply = <&pm660_l11>;
|
||||
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",
|
||||
"cam_vaf";
|
||||
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000 2800000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000 3400000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 105000 100000>;
|
||||
qcom,cam-vreg-min-voltage = <1780000 3300000 0 2800000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 0 3400000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 0 100000>;
|
||||
qcom,gpio-no-mux = <0>;
|
||||
pinctrl-names = "cam_default", "cam_suspend";
|
||||
pinctrl-0 = <&cam_sensor_mclk1_active
|
||||
|
|
@ -188,16 +206,13 @@
|
|||
&cam_sensor_front_suspend>;
|
||||
gpios = <&tlmm 33 0>,
|
||||
<&tlmm 47 0>,
|
||||
<&pm660_gpios 3 0>,
|
||||
<&tlmm 44 0>;
|
||||
qcom,gpio-reset = <1>;
|
||||
qcom,gpio-vdig = <2>;
|
||||
qcom,gpio-vana = <3>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2 3>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0 0>;
|
||||
qcom,gpio-vana = <2>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0>;
|
||||
qcom,gpio-req-tbl-label = "CAMIF_MCLK2",
|
||||
"CAM_RESET2",
|
||||
"CAM_VDIG",
|
||||
"CAM_VANA";
|
||||
qcom,sensor-position = <1>;
|
||||
qcom,sensor-mode = <0>;
|
||||
|
|
@ -221,12 +236,12 @@
|
|||
qcom,ois-src = <&ois0>;
|
||||
qcom,eeprom-src = <&eeprom0>;
|
||||
cam_vio-supply = <&pm660_l11>;
|
||||
cam_vana-supply = <&pm660l_bob>;
|
||||
cam_vdig-supply = <&pm660_s5>;
|
||||
cam_vana-supply = <&cam_avdd_gpio_regulator>;
|
||||
cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;
|
||||
qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";
|
||||
qcom,cam-vreg-min-voltage = <1780000 3300000 1350000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 105000>;
|
||||
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_mclk0_active
|
||||
|
|
@ -234,18 +249,12 @@
|
|||
pinctrl-1 = <&cam_sensor_mclk0_suspend
|
||||
&cam_sensor_rear_suspend>;
|
||||
gpios = <&tlmm 32 0>,
|
||||
<&tlmm 46 0>,
|
||||
<&pm660l_gpios 4 0>,
|
||||
<&tlmm 51 0>;
|
||||
<&tlmm 46 0>;
|
||||
qcom,gpio-reset = <1>;
|
||||
qcom,gpio-vdig = <2>;
|
||||
qcom,gpio-vana = <3>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2 3>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0 0>;
|
||||
qcom,gpio-req-tbl-num = <0 1>;
|
||||
qcom,gpio-req-tbl-flags = <1 0>;
|
||||
qcom,gpio-req-tbl-label = "CAMIF_MCLK0",
|
||||
"CAM_RESET0",
|
||||
"CAM_VDIG",
|
||||
"CAM_VANA";
|
||||
"CAM_RESET0";
|
||||
qcom,sensor-position = <0>;
|
||||
qcom,sensor-mode = <0>;
|
||||
qcom,cci-master = <0>;
|
||||
|
|
@ -266,12 +275,12 @@
|
|||
qcom,actuator-src = <&actuator1>;
|
||||
qcom,eeprom-src = <&eeprom1>;
|
||||
cam_vio-supply = <&pm660_l11>;
|
||||
cam_vana-supply = <&pm660l_bob>;
|
||||
cam_vdig-supply = <&pm660_s5>;
|
||||
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 3300000 1350000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 105000>;
|
||||
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_mclk2_active
|
||||
|
|
@ -279,18 +288,12 @@
|
|||
pinctrl-1 = <&cam_sensor_mclk2_suspend
|
||||
&cam_sensor_rear2_suspend>;
|
||||
gpios = <&tlmm 34 0>,
|
||||
<&tlmm 48 0>,
|
||||
<&pm660l_gpios 3 0>,
|
||||
<&tlmm 51 0>;
|
||||
<&tlmm 48 0>;
|
||||
qcom,gpio-reset = <1>;
|
||||
qcom,gpio-vdig = <2>;
|
||||
qcom,gpio-vana = <3>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2 3>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0 0>;
|
||||
qcom,gpio-req-tbl-num = <0 1>;
|
||||
qcom,gpio-req-tbl-flags = <1 0>;
|
||||
qcom,gpio-req-tbl-label = "CAMIF_MCLK",
|
||||
"CAM_RESET",
|
||||
"CAM_VDIG",
|
||||
"CAM_VANA";
|
||||
"CAM_RESET";
|
||||
qcom,sensor-position = <0>;
|
||||
qcom,sensor-mode = <0>;
|
||||
qcom,cci-master = <1>;
|
||||
|
|
@ -311,12 +314,12 @@
|
|||
qcom,actuator-src = <&actuator2>;
|
||||
qcom,eeprom-src = <&eeprom2>;
|
||||
cam_vio-supply = <&pm660_l11>;
|
||||
cam_vana-supply = <&pm660l_bob>;
|
||||
cam_vdig-supply = <&pm660_s5>;
|
||||
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 3300000 1350000>;
|
||||
qcom,cam-vreg-max-voltage = <1950000 3600000 1350000>;
|
||||
qcom,cam-vreg-op-mode = <105000 80000 105000>;
|
||||
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_mclk1_active
|
||||
|
|
@ -324,18 +327,12 @@
|
|||
pinctrl-1 = <&cam_sensor_mclk1_suspend
|
||||
&cam_sensor_front_suspend>;
|
||||
gpios = <&tlmm 33 0>,
|
||||
<&tlmm 47 0>,
|
||||
<&pm660l_gpios 3 0>,
|
||||
<&tlmm 51 0>;
|
||||
<&tlmm 47 0>;
|
||||
qcom,gpio-reset = <1>;
|
||||
qcom,gpio-vdig = <2>;
|
||||
qcom,gpio-vana = <3>;
|
||||
qcom,gpio-req-tbl-num = <0 1 2 3>;
|
||||
qcom,gpio-req-tbl-flags = <1 0 0 0>;
|
||||
qcom,gpio-req-tbl-num = <0 1>;
|
||||
qcom,gpio-req-tbl-flags = <1 0>;
|
||||
qcom,gpio-req-tbl-label = "CAMIF_MCLK2",
|
||||
"CAM_RESET2",
|
||||
"CAM_VDIG",
|
||||
"CAM_VANA";
|
||||
"CAM_RESET2";
|
||||
qcom,sensor-position = <1>;
|
||||
qcom,sensor-mode = <0>;
|
||||
qcom,cci-master = <1>;
|
||||
|
|
@ -345,6 +342,46 @@
|
|||
clock-names = "cam_src_clk", "cam_clk";
|
||||
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>;
|
||||
status = "ok";
|
||||
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 {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue