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

Merge "ARM: dts: msm: Add support TOF sensor on msm8998"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-19 20:46:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3daf91ef36
6 changed files with 75 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
arch/arm/boot/dts/qcom/msm8998-camera-sensor-cdp.dtsi
View file

@ -29,6 +29,16 @@
qcom,switch-source = <&pmi8998_switch1>; qcom,switch-source = <&pmi8998_switch1>;
status = "ok"; status = "ok";
}; };
actuator_regulator: gpio-regulator@0 {
compatible = "regulator-fixed";
regulator-name = "rear_vana_regulator";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
enable-active-high;
gpio = <&tlmm 27 0>;
vin-supply = <&pmi8998_bob>;
};
}; };
&cci { &cci {
@ -37,14 +47,11 @@
reg = <0x0>; reg = <0x0>;
compatible = "qcom,actuator"; compatible = "qcom,actuator";
qcom,cci-master = <0>; qcom,cci-master = <0>;
gpios = <&tlmm 27 0>; cam_vaf-supply = <&actuator_regulator>;
qcom,gpio-vaf = <0>; qcom,cam-vreg-name = "cam_vaf";
qcom,gpio-req-tbl-num = <0>; qcom,cam-vreg-min-voltage = <2800000>;
qcom,gpio-req-tbl-flags = <0>; qcom,cam-vreg-max-voltage = <2800000>;
qcom,gpio-req-tbl-label = "CAM_VAF"; qcom,cam-vreg-op-mode = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_actuator_vaf_active>;
pinctrl-1 = <&cam_actuator_vaf_suspend>;
}; };
actuator1: qcom,actuator@1 { actuator1: qcom,actuator@1 {
@ -52,14 +59,11 @@
reg = <0x1>; reg = <0x1>;
compatible = "qcom,actuator"; compatible = "qcom,actuator";
qcom,cci-master = <1>; qcom,cci-master = <1>;
gpios = <&tlmm 27 0>; cam_vaf-supply = <&actuator_regulator>;
qcom,gpio-vaf = <0>; qcom,cam-vreg-name = "cam_vaf";
qcom,gpio-req-tbl-num = <0>; qcom,cam-vreg-min-voltage = <2800000>;
qcom,gpio-req-tbl-flags = <0>; qcom,cam-vreg-max-voltage = <2800000>;
qcom,gpio-req-tbl-label = "CAM_VAF"; qcom,cam-vreg-op-mode = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_actuator_vaf_active>;
pinctrl-1 = <&cam_actuator_vaf_suspend>;
}; };
ois0: qcom,ois@0 { ois0: qcom,ois@0 {
@ -78,24 +82,23 @@
status = "disabled"; status = "disabled";
}; };
tof0:qcom,tof@0{ tof0: qcom,tof@0 {
cell-index = <0>; cell-index = <0>;
reg = <0x29>; reg = <0x29>;
compatible = "st,stmvl53l0"; compatible = "st,stmvl53l0";
qcom,cci-master = <0>; qcom,cci-master = <0>;
cam_cci-supply = <&pm8998_lvs1>; cam_cci-supply = <&pm8998_lvs1>;
cam_laser-supply = <&pmi8998_bob>; cam_laser-supply = <&actuator_regulator>;
qcom,cam-vreg-name = "cam_cci", "cam_laser"; qcom,cam-vreg-name = "cam_cci", "cam_laser";
qcom,cam-vreg-min-voltage = <0 0>; qcom,cam-vreg-min-voltage = <0 0>;
qcom,cam-vreg-max-voltage = <0 3600000>; qcom,cam-vreg-max-voltage = <0 2800000>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_tof_active>; pinctrl-0 = <&cam_tof_active>;
pinctrl-1 = <&cam_tof_suspend>; pinctrl-1 = <&cam_tof_suspend>;
gpios = <&tlmm 27 0>, gpios = <&tlmm 126 0>;
<&tlmm 126 0>; qcom,gpio-req-tbl-num = <0>;
qcom,gpio-req-tbl-num = <0 1>; qcom,gpio-req-tbl-flags = <0>;
qcom,gpio-req-tbl-flags = <0 0>; qcom,gpio-req-tbl-label = "CAM_CE";
qcom,gpio-req-tbl-label = "CAM_TOF", "CAM_CE";
}; };
eeprom0: qcom,eeprom@0 { eeprom0: qcom,eeprom@0 {

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

@ -29,6 +29,16 @@
qcom,switch-source = <&pmi8998_switch1>; qcom,switch-source = <&pmi8998_switch1>;
status = "ok"; status = "ok";
}; };
actuator_regulator: gpio-regulator@0 {
compatible = "regulator-fixed";
regulator-name = "rear_vana_regulator";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
enable-active-high;
gpio = <&tlmm 27 0>;
vin-supply = <&pmi8998_bob>;
};
}; };
&cci { &cci {
@ -37,14 +47,11 @@
reg = <0x0>; reg = <0x0>;
compatible = "qcom,actuator"; compatible = "qcom,actuator";
qcom,cci-master = <0>; qcom,cci-master = <0>;
gpios = <&tlmm 27 0>; cam_vaf-supply = <&actuator_regulator>;
qcom,gpio-vaf = <0>; qcom,cam-vreg-name = "cam_vaf";
qcom,gpio-req-tbl-num = <0>; qcom,cam-vreg-min-voltage = <2800000>;
qcom,gpio-req-tbl-flags = <0>; qcom,cam-vreg-max-voltage = <2800000>;
qcom,gpio-req-tbl-label = "CAM_VAF"; qcom,cam-vreg-op-mode = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_actuator_vaf_active>;
pinctrl-1 = <&cam_actuator_vaf_suspend>;
}; };
actuator1: qcom,actuator@1 { actuator1: qcom,actuator@1 {
@ -52,33 +59,32 @@
reg = <0x1>; reg = <0x1>;
compatible = "qcom,actuator"; compatible = "qcom,actuator";
qcom,cci-master = <1>; qcom,cci-master = <1>;
gpios = <&tlmm 27 0>; cam_vaf-supply = <&actuator_regulator>;
qcom,gpio-vaf = <0>; qcom,cam-vreg-name = "cam_vaf";
qcom,gpio-req-tbl-num = <0>; qcom,cam-vreg-min-voltage = <2800000>;
qcom,gpio-req-tbl-flags = <0>; qcom,cam-vreg-max-voltage = <2800000>;
qcom,gpio-req-tbl-label = "CAM_VAF"; qcom,cam-vreg-op-mode = <0>;
pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_actuator_vaf_active>;
pinctrl-1 = <&cam_actuator_vaf_suspend>;
}; };
tof0:qcom,tof@0{
tof0: qcom,tof@0 {
cell-index = <0>; cell-index = <0>;
reg = <0x29>; reg = <0x29>;
compatible = "st,stmvl53l0"; compatible = "st,stmvl53l0";
qcom,cci-master = <0>; qcom,cci-master = <0>;
cam_cci-supply = <&pm8998_lvs1>; cam_cci-supply = <&pm8998_lvs1>;
cam_laser-supply = <&pmi8998_bob>; cam_laser-supply = <&actuator_regulator>;
qcom,cam-vreg-name = "cam_cci", "cam_laser"; qcom,cam-vreg-name = "cam_cci", "cam_laser";
qcom,cam-vreg-min-voltage = <0 0>; qcom,cam-vreg-min-voltage = <0 0>;
qcom,cam-vreg-max-voltage = <0 3600000>; qcom,cam-vreg-max-voltage = <0 2800000>;
pinctrl-names = "cam_default", "cam_suspend"; pinctrl-names = "cam_default", "cam_suspend";
pinctrl-0 = <&cam_tof_active>; pinctrl-0 = <&cam_tof_active>;
pinctrl-1 = <&cam_tof_suspend>; pinctrl-1 = <&cam_tof_suspend>;
gpios = <&tlmm 27 0>, <&tlmm 126 0>; gpios = <&tlmm 126 0>;
qcom,gpio-req-tbl-num = <0 1>; qcom,gpio-req-tbl-num = <0>;
qcom,gpio-req-tbl-flags = <0 0>; qcom,gpio-req-tbl-flags = <0>;
qcom,gpio-req-tbl-label = "CAM_TOF", "CAM_CE"; qcom,gpio-req-tbl-label = "CAM_CE";
}; };
ois0: qcom,ois@0 { ois0: qcom,ois@0 {
cell-index = <0>; cell-index = <0>;
reg = <0x0>; reg = <0x0>;

6
arch/arm/boot/dts/qcom/msm8998-interposer-camera-sensor-cdp.dtsi
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -144,6 +144,10 @@
/delete-node/qcom,ois@0; /delete-node/qcom,ois@0;
}; };
&soc {
/delete-node/gpio-regulator@0;
};
&cci { &cci {
actuator0: qcom,actuator@0 { actuator0: qcom,actuator@0 {
cell-index = <0>; cell-index = <0>;

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -132,6 +132,10 @@
}; };
}; };
&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;

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -170,6 +170,10 @@
}; };
}; };
&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;

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

@ -956,12 +956,12 @@
cam_tof_active: cam_tof_active { cam_tof_active: cam_tof_active {
mux { mux {
pins = "gpio27", "gpio126"; pins = "gpio26", "gpio126";
function = "gpio"; function = "gpio";
}; };
config { config {
pins = "gpio27", "gpio126"; pins = "gpio26", "gpio126";
bias-disable; bias-disable;
drive-strength = <2>; /* 2 MA */ drive-strength = <2>; /* 2 MA */
}; };
@ -969,12 +969,12 @@
cam_tof_suspend: cam_tof_suspend { cam_tof_suspend: cam_tof_suspend {
mux { mux {
pins = "gpio27", "gpio126"; pins = "gpio26", "gpio126";
function = "gpio"; function = "gpio";
}; };
config { config {
pins = "gpio27", "gpio126"; pins = "gpio26", "gpio126";
bias-pull-down; /* PULL DOWN */ bias-pull-down; /* PULL DOWN */
drive-strength = <2>; /* 2 MA */ drive-strength = <2>; /* 2 MA */
}; };