diff options
| author | Bikas Gurung <brgurung@google.com> | 2018-09-19 16:15:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-19 16:15:46 +0000 |
| commit | 6ab805c8a7e3691def00a0debeb3e07fa459f221 (patch) | |
| tree | d942cfdd666c45d8a79f3fb11bec2fe4391aed18 | |
| parent | 61f576e613d8cb98be3b94218bf3d1e49835080e (diff) | |
| parent | 7502e53cc2c95e722bf510f509e48ced51b3f2e2 (diff) | |
| download | qcom-msm-v4.9-6ab805c8a7e3691def00a0debeb3e07fa459f221.tar.gz | |
Merge "cygnus: Update dtsi to support imx307 sensor" into oc-mr1-iot-dev
5 files changed, 66 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-camera.dtsi b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-camera.dtsi new file mode 100644 index 000000000000..7c3331d271f0 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-camera.dtsi @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +&cci { + /delete-node/ qcom,camera@0; + /delete-node/ qcom,camera@1; + + qcom,camera@0 { + cell-index = <0>; + compatible = "qcom,camera"; + reg = <0x0>; + qcom,csiphy-sd-index = <0>; + qcom,csid-sd-index = <0>; + qcom,mount-angle = <270>; + qcom,eeprom-src = <&eeprom0>; + cam_vdig-supply = <&pm8953_l2>; + cam_vio-supply = <&pm8953_l6>; + cam_vana-supply = <&pm8953_l17>; + qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana"; + qcom,cam-vreg-min-voltage = <1200000 1800000 3000000>; + qcom,cam-vreg-max-voltage = <1200000 1800000 3000000>; + qcom,cam-vreg-op-mode = <200000 0 100000>; + pinctrl-names = "cam_default", "cam_suspend"; + pinctrl-0 = <&cam_sensor_mclk0_default + &cam_sensor_rear_default>; + pinctrl-1 = <&cam_sensor_mclk0_sleep + &cam_sensor_rear_sleep>; + gpios = <&tlmm 26 0>, + <&tlmm 40 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_MCLK0", + "CAM_RESET0"; + qcom,sensor-position = <0>; + qcom,sensor-mode = <0>; + qcom,cci-master = <0>; + status = "ok"; + clocks = <&clock_gcc clk_mclk0_clk_src>, + <&clock_gcc clk_gcc_camss_mclk0_clk>; + clock-names = "cam_src_clk", "cam_clk"; + qcom,clock-rates = <24000000 0>; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-dev.dts b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-dev.dts index d935271d7b3c..51f089a37991 100644 --- a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-dev.dts +++ b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-dev.dts @@ -15,6 +15,7 @@ #include "apq8053-lat-concam.dtsi" #include "apq8053-camera-sensor-mtp.dtsi" +#include "apq8053-lat-concam-camera.dtsi" #include "apq8053-lat-concam-regulator.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-evt.dts b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-evt.dts index ff436cc28541..ac71d62978e6 100644 --- a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-evt.dts +++ b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-evt.dts @@ -15,6 +15,7 @@ #include "apq8053-lat-concam.dtsi" #include "apq8053-camera-sensor-mtp.dtsi" +#include "apq8053-lat-concam-camera.dtsi" #include "apq8053-lat-concam-regulator.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-proto.dts b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-proto.dts index 6c91b0d1752b..e7d61aee18d8 100644 --- a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-proto.dts +++ b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-proto.dts @@ -15,6 +15,7 @@ #include "apq8053-lat-concam.dtsi" #include "apq8053-camera-sensor-mtp.dtsi" +#include "apq8053-lat-concam-camera.dtsi" #include "apq8053-lat-concam-regulator.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-regulator.dtsi b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-regulator.dtsi index 8fae2866fc88..6ff61cb7c2df 100644 --- a/arch/arm64/boot/dts/qcom/apq8053-lat-concam-regulator.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8053-lat-concam-regulator.dtsi @@ -98,8 +98,9 @@ compatible = "qcom,rpm-smd-regulator"; regulator-name = "pm8953_l2"; qcom,set = <3>; - regulator-always-on; - regulator-boot-on; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + qcom,init-voltage = <1200000>; status = "okay"; }; }; @@ -133,8 +134,9 @@ compatible = "qcom,rpm-smd-regulator"; regulator-name = "pm8953_l17"; qcom,set = <3>; - regulator-always-on; - regulator-boot-on; + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <3200000>; + qcom,init-voltage = <3020000>; status = "okay"; }; }; @@ -152,8 +154,9 @@ compatible = "qcom,rpm-smd-regulator"; regulator-name = "pm8953_l6"; qcom,set = <3>; - regulator-always-on; - regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,init-voltage = <1800000>; status = "okay"; }; }; |