Merge "ARM: dts: msm: Update PMIC adc_tm nodes for ravelin"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
cda4e3edf8
@@ -156,19 +156,20 @@
|
||||
|
||||
&pm7250b_adc_tm {
|
||||
interrupts = <0x8 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
|
||||
io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>,
|
||||
<&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>;
|
||||
|
||||
/* Channel nodes */
|
||||
pm7250b_usb_conn_therm {
|
||||
reg = <ADC5_AMUX_THM3_100K_PU>;
|
||||
reg = <0>;
|
||||
io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pm7250b_smb_skin_therm {
|
||||
reg = <ADC5_AMUX_THM1_100K_PU>;
|
||||
reg = <1>;
|
||||
io-channels = <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -293,7 +294,7 @@
|
||||
sys-therm-7 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM3_100K_PU>;
|
||||
thermal-sensors = <&pm7250b_adc_tm 0>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -312,7 +313,7 @@
|
||||
sys-therm-6 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM1_100K_PU>;
|
||||
thermal-sensors = <&pm7250b_adc_tm 1>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
|
@@ -100,19 +100,19 @@
|
||||
};
|
||||
|
||||
&pmk8350_adc_tm {
|
||||
io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>,
|
||||
<&pmk8350_vadc PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
|
||||
/* Channel nodes */
|
||||
pmk8350_xo_therm {
|
||||
reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
|
||||
reg = <0>;
|
||||
io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pm6450_quiet_therm {
|
||||
reg = <PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
reg = <1>;
|
||||
io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -233,34 +233,33 @@
|
||||
};
|
||||
|
||||
&pm6150l_adc_tm {
|
||||
io-channels = <&pm6150l_vadc ADC5_AMUX_THM1_100K_PU>,
|
||||
<&pm6150l_vadc ADC5_AMUX_THM3_100K_PU>,
|
||||
<&pm6150l_vadc ADC5_GPIO1_100K_PU>,
|
||||
<&pm6150l_vadc ADC5_GPIO3_100K_PU>;
|
||||
|
||||
/* Channel nodes */
|
||||
pa_therm2 {
|
||||
reg = <ADC5_AMUX_THM1_100K_PU>;
|
||||
reg = <0>;
|
||||
io-channels = <&pm6150l_vadc ADC5_AMUX_THM1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pa_therm1 {
|
||||
reg = <ADC5_AMUX_THM3_100K_PU>;
|
||||
reg = <1>;
|
||||
io-channels = <&pm6150l_vadc ADC5_AMUX_THM3_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
ufs_therm {
|
||||
reg = <ADC5_GPIO1_100K_PU>;
|
||||
reg = <2>;
|
||||
io-channels = <&pm6150l_vadc ADC5_GPIO1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
wide_rfc_therm {
|
||||
reg = <ADC5_GPIO3_100K_PU>;
|
||||
reg = <3>;
|
||||
io-channels = <&pm6150l_vadc ADC5_GPIO3_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -283,7 +282,7 @@
|
||||
xo-therm {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 0>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -302,7 +301,7 @@
|
||||
sys-therm-1 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm6150l_adc_tm ADC5_GPIO1_100K_PU>;
|
||||
thermal-sensors = <&pm6150l_adc_tm 2>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -321,7 +320,7 @@
|
||||
sys-therm-2 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm6150l_adc_tm ADC5_GPIO3_100K_PU>;
|
||||
thermal-sensors = <&pm6150l_adc_tm 3>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -340,7 +339,7 @@
|
||||
sys-therm-3 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 1>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -359,7 +358,7 @@
|
||||
sys-therm-4 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm6150l_adc_tm ADC5_AMUX_THM1_100K_PU>;
|
||||
thermal-sensors = <&pm6150l_adc_tm 0>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -378,7 +377,7 @@
|
||||
sys-therm-5 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm6150l_adc_tm ADC5_AMUX_THM3_100K_PU>;
|
||||
thermal-sensors = <&pm6150l_adc_tm 1>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
|
@@ -84,9 +84,9 @@
|
||||
};
|
||||
|
||||
pm6150l_adc_tm: adc_tm@3500 {
|
||||
compatible = "qcom,spmi-adc-tm5";
|
||||
reg = <0x3500>;
|
||||
interrupts = <0x4 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "threshold";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
|
@@ -158,9 +158,9 @@
|
||||
};
|
||||
|
||||
pm7250b_adc_tm: adc_tm@3500 {
|
||||
compatible = "qcom,spmi-adc-tm5";
|
||||
reg = <0x3500>;
|
||||
interrupts = <0x2 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "threshold";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
|
@@ -116,9 +116,9 @@
|
||||
};
|
||||
|
||||
pmi632_adc_tm: adc_tm@3500 {
|
||||
compatible = "qcom,spmi-adc-tm5";
|
||||
reg = <0x3500>;
|
||||
interrupts = <0x2 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "threshold";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
|
@@ -183,9 +183,9 @@
|
||||
};
|
||||
|
||||
pmk8350_adc_tm: adc_tm@3400 {
|
||||
compatible = "qcom,spmi-adc-tm5-gen2";
|
||||
reg = <0x3400>;
|
||||
interrupts = <0x0 0x34 0x0 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "threshold";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
|
@@ -125,19 +125,20 @@
|
||||
|
||||
&pm7250b_adc_tm {
|
||||
interrupts = <0x8 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
|
||||
io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>,
|
||||
<&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>;
|
||||
|
||||
/* Channel nodes */
|
||||
pm7250b_usb_conn_therm {
|
||||
reg = <ADC5_AMUX_THM3_100K_PU>;
|
||||
reg = <0>;
|
||||
io-channels = <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pm7250b_charger_skin_therm {
|
||||
reg = <ADC5_AMUX_THM1_100K_PU>;
|
||||
reg = <1>;
|
||||
io-channels = <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -252,7 +253,7 @@
|
||||
sys-therm-9 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM3_100K_PU>;
|
||||
thermal-sensors = <&pm7250b_adc_tm 0>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -271,7 +272,7 @@
|
||||
sys-therm-7 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM1_100K_PU>;
|
||||
thermal-sensors = <&pm7250b_adc_tm 1>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
|
@@ -143,26 +143,26 @@
|
||||
};
|
||||
|
||||
&pmi632_adc_tm {
|
||||
io-channels = <&pmi632_vadc ADC5_GPIO1_100K_PU>,
|
||||
<&pmi632_vadc ADC5_GPIO2_100K_PU>,
|
||||
<&pmi632_vadc ADC5_GPIO3_100K_PU>;
|
||||
|
||||
/*Channel nodes */
|
||||
pmi632_usb_conn_therm {
|
||||
reg = <ADC5_GPIO1_100K_PU>;
|
||||
reg = <0>;
|
||||
io-channels = <&pmi632_vadc ADC5_GPIO1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pmi632_charger_skin_temp {
|
||||
reg = <ADC5_GPIO2_100K_PU>;
|
||||
reg = <1>;
|
||||
io-channels = <&pmi632_vadc ADC5_GPIO2_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pmi632_smb_skin_therm {
|
||||
reg = <ADC5_GPIO3_100K_PU>;
|
||||
reg = <2>;
|
||||
io-channels = <&pmi632_vadc ADC5_GPIO3_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
};
|
||||
@@ -262,7 +262,7 @@
|
||||
sys-therm-9 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmi632_adc_tm ADC5_GPIO1_100K_PU>;
|
||||
thermal-sensors = <&pmi632_adc_tm 0>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -281,7 +281,7 @@
|
||||
sys-therm-7 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmi632_adc_tm ADC5_GPIO2_100K_PU>;
|
||||
thermal-sensors = <&pmi632_adc_tm 1>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -300,7 +300,7 @@
|
||||
sys-therm-8 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmi632_adc_tm ADC5_GPIO3_100K_PU>;
|
||||
thermal-sensors = <&pmi632_adc_tm 2>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
|
@@ -155,47 +155,47 @@
|
||||
};
|
||||
|
||||
&pmk8350_adc_tm {
|
||||
io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>,
|
||||
<&pmk8350_vadc PM6450_ADC7_AMUX1_GPIO2_100K_PU>,
|
||||
<&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>,
|
||||
<&pmk8350_vadc PM6450_ADC7_AMUX4_GPIO5_100K_PU>,
|
||||
<&pmk8350_vadc PM6450_ADC7_AMUX3_GPIO4_100K_PU>,
|
||||
<&pmk8350_vadc PMK8350_ADC7_AMUX_THM3_100K_PU>;
|
||||
|
||||
/* Channel nodes */
|
||||
pmk8350_xo_therm {
|
||||
reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
|
||||
reg = <0>;
|
||||
io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pm6450_quiet_therm {
|
||||
reg = <PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
reg = <1>;
|
||||
io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pmk8350_wide_rfc_therm {
|
||||
reg = <PMK8350_ADC7_AMUX_THM2_100K_PU>;
|
||||
reg = <2>;
|
||||
io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM2_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pm6450_rear_cam_flash_therm {
|
||||
reg = <PM6450_ADC7_AMUX4_GPIO5_100K_PU>;
|
||||
reg = <3>;
|
||||
io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX4_GPIO5_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pm6450_pa2_therm {
|
||||
reg = <PM6450_ADC7_AMUX3_GPIO4_100K_PU>;
|
||||
reg = <4>;
|
||||
io-channels = <&pmk8350_vadc PM6450_ADC7_AMUX3_GPIO4_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
|
||||
pmk8350_pa1_therm {
|
||||
reg = <PMK8350_ADC7_AMUX_THM3_100K_PU>;
|
||||
reg = <5>;
|
||||
io-channels = <&pmk8350_vadc PMK8350_ADC7_AMUX_THM3_100K_PU>;
|
||||
qcom,ratiometric;
|
||||
qcom,hw-settle-time = <200>;
|
||||
qcom,hw-settle-time-us = <200>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
sys-therm-6 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 0>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -303,7 +303,7 @@
|
||||
sys-therm-4 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM2_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 2>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -322,7 +322,7 @@
|
||||
sys-therm-1 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX1_GPIO2_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 1>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -341,7 +341,7 @@
|
||||
sys-therm-3 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX4_GPIO5_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 3>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -360,7 +360,7 @@
|
||||
sys-therm-11 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PM6450_ADC7_AMUX3_GPIO4_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 4>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
@@ -379,7 +379,7 @@
|
||||
sys-therm-5 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM3_100K_PU>;
|
||||
thermal-sensors = <&pmk8350_adc_tm 5>;
|
||||
trips {
|
||||
active-config0 {
|
||||
temperature = <125000>;
|
||||
|
Reference in New Issue
Block a user