Skip to content

L
linux
Commit 41c18552 authored by Marijn Suijten's avatar Marijn Suijten Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: Use labels with generic node names for ADC channels 

As discussed in [1] it is more convenient to use a generic `channel`
node name for ADC channels while storing a friendly - board-specific
instead of PMIC-specific - name in the label, if/when desired to
overwrite the channel description already contained (but previously
unused) in the driver [2].  Follow up on the dt-bindings' `channel` node
name requirement, and instead provide this (sometimes per-board) channel
description through a label property.

Also remove all the unused label references (not to be confused with
label properties) from pm660, pmp8074 and pms405.

[1]: https://lore.kernel.org/linux-arm-msm/20221106193018.270106-1-marijn.suijten@somainline.org/T/#u
[2]: https://lore.kernel.org/linux-arm-msm/20230116220909.196926-4-marijn.suijten@somainline.org/Acked-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230730-generic-adc-channels-v5-2-e6c69bda8034@somainline.orgSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent b6866546
Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 163 deletions
arch/arm64/boot/dts/qcom/pm6125.dtsi
View file @ 41c18552
......@@ -85,36 +85,42 @@ pm6125_adc: adc@3100 {
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
#io-channel-cells = <1>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
vph-pwr@83 {
channel@83 {
reg = <ADC5_VPH_PWR>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
};
vcoin@85 {
channel@85 {
reg = <ADC5_VCOIN>;
qcom,pre-scaling = <1 3>;
label = "vcoin";
};
xo-therm@4c {
channel@4c {
reg = <ADC5_XO_THERM_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "xo_therm";
};
};
......
arch/arm64/boot/dts/qcom/pm6150.dtsi
View file @ 41c18552
......@@ -72,7 +72,7 @@ pm6150_adc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
label = "die_temp";
};
......
arch/arm64/boot/dts/qcom/pm6150l.dtsi
View file @ 41c18552
......@@ -60,25 +60,25 @@ pm6150l_adc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
adc-chan@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
adc-chan@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
adc-chan@83 {
channel@83 {
reg = <ADC5_VPH_PWR>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
......
arch/arm64/boot/dts/qcom/pm660.dtsi
View file @ 41c18552
......@@ -91,82 +91,93 @@ pm660_adc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
ref_gnd: ref_gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,decimation = <1024>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref_1p25: vref_1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,decimation = <1024>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die_temp: die_temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,decimation = <1024>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
xo_therm: xo_therm@4c {
channel@4c {
reg = <ADC5_XO_THERM_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,decimation = <1024>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "xo_therm";
};
msm_therm: msm_therm@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,decimation = <1024>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "msm_therm";
};
emmc_therm: emmc_therm@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,decimation = <1024>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "emmc_therm";
};
pa_therm0: thermistor0@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,decimation = <1024>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "pa_therm0";
};
pa_therm1: thermistor1@50 {
channel@50 {
reg = <ADC5_AMUX_THM4_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,decimation = <1024>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "pa_therm1";
};
quiet_therm: quiet_therm@51 {
channel@51 {
reg = <ADC5_AMUX_THM5_100K_PU>;
qcom,pre-scaling = <1 1>;
qcom,decimation = <1024>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "quiet_therm";
};
vadc_vph_pwr: vph_pwr@83 {
channel@83 {
reg = <ADC5_VPH_PWR>;
qcom,decimation = <1024>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
};
vcoin: vcoin@85 {
channel@85 {
reg = <ADC5_VCOIN>;
qcom,decimation = <1024>;
qcom,pre-scaling = <1 3>;
label = "vcoin";
};
};
......
arch/arm64/boot/dts/qcom/pm7250b.dtsi
View file @ 41c18552
......@@ -62,56 +62,56 @@ pm7250b_adc: adc@3100 {
#io-channel-cells = <1>;
interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
adc-chan@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
adc-chan@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
adc-chan@2 {
channel@2 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
adc-chan@7 {
channel@7 {
reg = <ADC5_USB_IN_I>;
qcom,pre-scaling = <1 1>;
label = "usb_in_i_uv";
};
adc-chan@8 {
channel@8 {
reg = <ADC5_USB_IN_V_16>;
qcom,pre-scaling = <1 16>;
label = "usb_in_v_div_16";
};
adc-chan@9 {
channel@9 {
reg = <ADC5_CHG_TEMP>;
qcom,pre-scaling = <1 1>;
label = "chg_temp";
};
adc-chan@e {
channel@e {
reg = <ADC5_AMUX_THM2>;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "smb1390_therm";
};
adc-chan@1e {
channel@1e {
reg = <ADC5_MID_CHG_DIV6>;
qcom,pre-scaling = <1 6>;
label = "chg_mid";
};
adc-chan@4b {
channel@4b {
reg = <ADC5_BAT_ID_100K_PU>;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
......@@ -119,19 +119,19 @@ adc-chan@4b {
label = "bat_id";
};
adc-chan@83 {
channel@83 {
reg = <ADC5_VPH_PWR>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
};
adc-chan@84 {
channel@84 {
reg = <ADC5_VBAT_SNS>;
qcom,pre-scaling = <1 3>;
label = "vbat_sns";
};
adc-chan@99 {
channel@99 {
reg = <ADC5_SBUx>;
qcom,pre-scaling = <1 3>;
label = "chg_sbux";
......
arch/arm64/boot/dts/qcom/pm8150.dtsi
View file @ 41c18552
......@@ -90,19 +90,19 @@ pm8150_adc: adc@3100 {
#io-channel-cells = <1>;
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
......
arch/arm64/boot/dts/qcom/pm8150b.dtsi
View file @ 41c18552
......@@ -76,25 +76,25 @@ pm8150b_adc: adc@3100 {
#io-channel-cells = <1>;
interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
chg-temp@9 {
channel@9 {
reg = <ADC5_CHG_TEMP>;
qcom,pre-scaling = <1 1>;
label = "chg_temp";
......
arch/arm64/boot/dts/qcom/pm8150l.dtsi
View file @ 41c18552
......@@ -70,19 +70,19 @@ pm8150l_adc: adc@3100 {
#io-channel-cells = <1>;
interrupts = <0x4 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
......
arch/arm64/boot/dts/qcom/pm8916.dtsi
View file @ 41c18552
......@@ -66,27 +66,27 @@ pm8916_vadc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@0 {
channel@0 {
reg = <VADC_USBIN>;
qcom,pre-scaling = <1 10>;
};
adc-chan@7 {
channel@7 {
reg = <VADC_VSYS>;
qcom,pre-scaling = <1 3>;
};
adc-chan@8 {
channel@8 {
reg = <VADC_DIE_TEMP>;
};
adc-chan@9 {
channel@9 {
reg = <VADC_REF_625MV>;
};
adc-chan@a {
channel@a {
reg = <VADC_REF_1250MV>;
};
adc-chan@e {
channel@e {
reg = <VADC_GND_REF>;
};
adc-chan@f {
channel@f {
reg = <VADC_VDD_VADC>;
};
};
......
arch/arm64/boot/dts/qcom/pm8950.dtsi
View file @ 41c18552
......@@ -50,77 +50,90 @@ pm8950_vadc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
vcoin@5 {
channel@5 {
reg = <VADC_VCOIN>;
qcom,pre-scaling = <1 1>;
label = "vcoin";
};
vph-pwr@7 {
channel@7 {
reg = <VADC_VSYS>;
qcom,pre-scaling = <1 1>;
label = "vph_pwr";
};
die-temp@8 {
channel@8 {
reg = <VADC_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
ref-625mv@9 {
channel@9 {
reg = <VADC_REF_625MV>;
qcom,pre-scaling = <1 1>;
label = "ref_625mv";
};
ref-1250mv@a {
channel@a {
reg = <VADC_REF_1250MV>;
qcom,pre-scaling = <1 1>;
label = "ref_1250mv";
};
ref-buf-625mv@c {
channel@c {
reg = <VADC_SPARE1>;
qcom,pre-scaling = <1 1>;
label = "ref_buf_625mv";
};
ref-gnd@e {
channel@e {
reg = <VADC_GND_REF>;
label = "ref_gnd";
};
ref-vdd@f {
channel@f {
reg = <VADC_VDD_VADC>;
label = "ref_vdd";
};
pa-therm1@11 {
channel@11 {
reg = <VADC_P_MUX2_1_1>;
qcom,pre-scaling = <1 1>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "pa_therm1";
};
case-therm@13 {
channel@13 {
reg = <VADC_P_MUX4_1_1>;
qcom,pre-scaling = <1 1>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "case_therm";
};
xo-therm@32 {
channel@32 {
reg = <VADC_LR_MUX3_XO_THERM>;
qcom,pre-scaling = <1 1>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "xo_therm";
};
pa-therm0@36 {
channel@36 {
reg = <VADC_LR_MUX7_HW_ID>;
qcom,pre-scaling = <1 1>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "pa_therm0";
};
xo-therm-buf@3c {
channel@3c {
reg = <VADC_LR_MUX3_BUF_XO_THERM>;
qcom,pre-scaling = <1 1>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "xo_therm_buf";
};
};
......
arch/arm64/boot/dts/qcom/pm8953.dtsi
View file @ 41c18552
......@@ -84,22 +84,22 @@ pm8953_vadc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@8 {
channel@8 {
reg = <VADC_DIE_TEMP>;
};
adc-chan@9 {
channel@9 {
reg = <VADC_REF_625MV>;
};
adc-chan@a {
channel@a {
reg = <VADC_REF_1250MV>;
};
adc-chan@c {
channel@c {
reg = <VADC_SPARE1>;
};
adc-chan@e {
channel@e {
reg = <VADC_GND_REF>;
};
adc-chan@f {
channel@f {
reg = <VADC_VDD_VADC>;
};
};
......
arch/arm64/boot/dts/qcom/pm8994.dtsi
View file @ 41c18552
......@@ -83,27 +83,27 @@ pm8994_vadc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@7 {
channel@7 {
reg = <VADC_VSYS>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
};
adc-chan@8 {
channel@8 {
reg = <VADC_DIE_TEMP>;
label = "die_temp";
};
adc-chan@9 {
channel@9 {
reg = <VADC_REF_625MV>;
label = "ref_625mv";
};
adc-chan@a {
channel@a {
reg = <VADC_REF_1250MV>;
label = "ref_1250mv";
};
adc-chan@e {
channel@e {
reg = <VADC_GND_REF>;
};
adc-chan@f {
channel@f {
reg = <VADC_VDD_VADC>;
};
};
......
arch/arm64/boot/dts/qcom/pm8998.dtsi
View file @ 41c18552
......@@ -86,7 +86,7 @@ pm8998_adc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
label = "die_temp";
};
......
arch/arm64/boot/dts/qcom/pmi8950.dtsi
View file @ 41c18552
......@@ -20,37 +20,37 @@ pmi8950_vadc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
adc-chan@0 {
channel@0 {
reg = <VADC_USBIN>;
qcom,pre-scaling = <1 4>;
label = "usbin";
};
adc-chan@1 {
channel@1 {
reg = <VADC_DCIN>;
qcom,pre-scaling = <1 4>;
label = "dcin";
};
adc-chan@2 {
channel@2 {
reg = <VADC_VCHG_SNS>;
qcom,pre-scaling = <1 1>;
label = "vchg_sns";
};
adc-chan@9 {
channel@9 {
reg = <VADC_REF_625MV>;
qcom,pre-scaling = <1 1>;
label = "ref_625mv";
};
adc-chan@a {
channel@a {
reg = <VADC_REF_1250MV>;
qcom,pre-scaling = <1 1>;
label = "ref_1250mv";
};
adc-chan@d {
channel@d {
reg = <VADC_SPARE2>;
qcom,pre-scaling = <1 1>;
label = "chg_temp";
......
arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi
View file @ 41c18552
......@@ -77,19 +77,19 @@ pmm8155au_1_adc: adc@3100 {
#io-channel-cells = <1>;
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
......
arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi
View file @ 41c18552
......@@ -69,19 +69,19 @@ pmm8155au_2_adc: adc@3100 {
#io-channel-cells = <1>;
interrupts = <0x4 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
......
arch/arm64/boot/dts/qcom/pmp8074.dtsi
View file @ 41c18552
......@@ -18,57 +18,66 @@ pmp8074_adc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
ref-gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref-1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
vref-vadc@2 {
channel@2 {
reg = <ADC5_VREF_VADC>;
qcom,pre-scaling = <1 1>;
label = "vref_vadc";
};
pmic_die: die-temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "pmic_die";
};
xo_therm: xo-temp@76 {
channel@76 {
reg = <ADC5_XO_THERM_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "xo_therm";
};
pa_therm1: thermistor1@77 {
channel@77 {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "pa_therm1";
};
pa_therm2: thermistor2@78 {
channel@78 {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "pa_therm2";
};
pa_therm3: thermistor3@79 {
channel@79 {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "pa_therm3";
};
vph-pwr@131 {
channel@131 {
reg = <ADC5_VPH_PWR>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
};
};
......
arch/arm64/boot/dts/qcom/pms405.dtsi
View file @ 41c18552
......@@ -81,45 +81,52 @@ pms405_adc: adc@3100 {
#size-cells = <0>;
#io-channel-cells = <1>;
ref_gnd@0 {
channel@0 {
reg = <ADC5_REF_GND>;
qcom,pre-scaling = <1 1>;
label = "ref_gnd";
};
vref_1p25@1 {
channel@1 {
reg = <ADC5_1P25VREF>;
qcom,pre-scaling = <1 1>;
label = "vref_1p25";
};
pon_1: vph_pwr@131 {
channel@131 {
reg = <ADC5_VPH_PWR>;
qcom,pre-scaling = <1 3>;
label = "vph_pwr";
};
die_temp@6 {
channel@6 {
reg = <ADC5_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "die_temp";
};
pa_therm1: thermistor1@77 {
channel@77 {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "pa_therm1";
};
pa_therm3: thermistor3@79 {
channel@79 {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "pa_therm3";
};
xo_therm: xo_temp@76 {
channel@76 {
reg = <ADC5_XO_THERM_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "xo_therm";
};
};
......
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
View file @ 41c18552
......@@ -640,16 +640,18 @@ &mdss_dsi0_phy {
};
&pm8150_adc {
xo-therm@4c {
channel@4c {
reg = <ADC5_XO_THERM_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "xo_therm";
};
wifi-therm@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "wifi_therm";
};
};
......@@ -717,10 +719,11 @@ &pm8150_gpios {
};
&pm8150b_adc {
conn-therm@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "conn_therm";
};
};
......@@ -752,16 +755,18 @@ &pm8150b_gpios {
};
&pm8150l_adc {
skin-msm-therm@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "skin_msm_therm";
};
pm8150l-therm@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "pm8150l_therm";
};
};
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
View file @ 41c18552
......@@ -24,8 +24,8 @@ &charger_thermal {
};
&pm6150_adc {
/delete-node/ skin-temp-thermistor@4e;
/delete-node/ charger-thermistor@4f;
/delete-node/ channel@4e;
/delete-node/ channel@4f;
};
&pm6150_adc_tm {
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
View file @ 41c18552
......@@ -119,10 +119,11 @@ &panel {
};
&pm6150_adc {
skin-temp-thermistor@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "skin_therm";
};
};
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
View file @ 41c18552
......@@ -145,10 +145,11 @@ &panel {
};
&pm6150_adc {
skin-temp-thermistor@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "skin_therm";
};
};
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
View file @ 41c18552
......@@ -55,7 +55,7 @@ &panel {
};
&pm6150_adc {
/delete-node/ charger-thermistor@4f;
/delete-node/ channel@4f;
};
&pm6150_adc_tm {
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts
View file @ 41c18552
......@@ -27,7 +27,7 @@ &charger_thermal {
};
&pm6150_adc {
/delete-node/ charger-thermistor@4f;
/delete-node/ channel@4f;
};
&pm6150_adc_tm {
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts
View file @ 41c18552
......@@ -24,7 +24,7 @@ &charger_thermal {
};
&pm6150_adc {
/delete-node/ charger-thermistor@4f;
/delete-node/ channel@4f;
};
&pm6150_adc_tm {
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
View file @ 41c18552
......@@ -148,10 +148,11 @@ &pen_insert {
};
&pm6150_adc {
5v-choke-thermistor@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "5v_choke_therm";
};
};
......
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
View file @ 41c18552
......@@ -163,10 +163,11 @@ endpoint {
};
&pm6150_adc {
skin-temp-thermistor@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "skin_therm";
};
};
......
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
View file @ 41c18552
......@@ -837,10 +837,11 @@ &mdss_dsi0_phy {
};
&pm6150_adc {
charger-thermistor@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "charger_therm";
};
};
......
arch/arm64/boot/dts/qcom/sc7280-idp.dts
View file @ 41c18552
......@@ -73,7 +73,7 @@ &nvme_3v3_regulator {
};
&pmk8350_vadc {
pmr735a-die-temp@403 {
channel@403 {
reg = <PMR735A_ADC7_DIE_TEMP>;
label = "pmr735a_die_temp";
qcom,pre-scaling = <1 1>;
......
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
View file @ 41c18552
......@@ -432,7 +432,7 @@ &pcie1_phy {
};
&pmk8350_vadc {
pmk8350-die-temp@3 {
channel@3 {
reg = <PMK8350_ADC7_DIE_TEMP>;
label = "pmk8350_die_temp";
qcom,pre-scaling = <1 1>;
......
arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi
View file @ 41c18552
......@@ -383,13 +383,13 @@ &pm8350c_pwm {
};
&pmk8350_vadc {
pmk8350-die-temp@3 {
channel@3 {
reg = <PMK8350_ADC7_DIE_TEMP>;
label = "pmk8350_die_temp";
qcom,pre-scaling = <1 1>;
};
pmr735a-die-temp@403 {
channel@403 {
reg = <PMR735A_ADC7_DIE_TEMP>;
label = "pmr735a_die_temp";
qcom,pre-scaling = <1 1>;
......
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
View file @ 41c18552
......@@ -834,88 +834,88 @@ rtc_offset: rtc-offset@bc {
&pmk8280_vadc {
status = "okay";
pmic-die-temp@3 {
channel@3 {
reg = <PMK8350_ADC7_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "pmk8350_die_temp";
};
xo-therm@44 {
channel@44 {
reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "pmk8350_xo_therm";
};
pmic-die-temp@103 {
channel@103 {
reg = <PM8350_ADC7_DIE_TEMP(1)>;
qcom,pre-scaling = <1 1>;
label = "pmc8280_1_die_temp";
};
sys-therm@144 {
channel@144 {
reg = <PM8350_ADC7_AMUX_THM1_100K_PU(1)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm1";
};
sys-therm@145 {
channel@145 {
reg = <PM8350_ADC7_AMUX_THM2_100K_PU(1)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm2";
};
sys-therm@146 {
channel@146 {
reg = <PM8350_ADC7_AMUX_THM3_100K_PU(1)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm3";
};
sys-therm@147 {
channel@147 {
reg = <PM8350_ADC7_AMUX_THM4_100K_PU(1)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm4";
};
pmic-die-temp@303 {
channel@303 {
reg = <PM8350_ADC7_DIE_TEMP(3)>;
qcom,pre-scaling = <1 1>;
label = "pmc8280_2_die_temp";
};
sys-therm@344 {
channel@344 {
reg = <PM8350_ADC7_AMUX_THM1_100K_PU(3)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm5";
};
sys-therm@345 {
channel@345 {
reg = <PM8350_ADC7_AMUX_THM2_100K_PU(3)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm6";
};
sys-therm@346 {
channel@346 {
reg = <PM8350_ADC7_AMUX_THM3_100K_PU(3)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm7";
};
sys-therm@347 {
channel@347 {
reg = <PM8350_ADC7_AMUX_THM4_100K_PU(3)>;
qcom,hw-settle-time = <200>;
qcom,ratiometric;
label = "sys_therm8";
};
pmic-die-temp@403 {
channel@403 {
reg = <PMR735A_ADC7_DIE_TEMP>;
qcom,pre-scaling = <1 1>;
label = "pmr735a_die_temp";
......
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
View file @ 41c18552
......@@ -1071,27 +1071,27 @@ &pm8005_gpios {
};
&pm8998_adc {
adc-chan@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
label = "sdm_temp";
};
adc-chan@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
label = "quiet_temp";
};
adc-chan@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
label = "lte_temp_1";
};
adc-chan@50 {
channel@50 {
reg = <ADC5_AMUX_THM4_100K_PU>;
label = "lte_temp_2";
};
adc-chan@51 {
channel@51 {
reg = <ADC5_AMUX_THM5_100K_PU>;
label = "charger_temp";
};
......
arch/arm64/boot/dts/qcom/sdm845-mtp.dts
View file @ 41c18552
......@@ -534,42 +534,42 @@ &mss_pil {
};
&pm8998_adc {
adc-chan@4c {
channel@4c {
reg = <ADC5_XO_THERM_100K_PU>;
label = "xo_therm";
qcom,ratiometric;
qcom,hw-settle-time = <200>;
};
adc-chan@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
label = "msm_therm";
qcom,ratiometric;
qcom,hw-settle-time = <200>;
};
adc-chan@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
label = "pa_therm1";
qcom,ratiometric;
qcom,hw-settle-time = <200>;
};
adc-chan@51 {
channel@51 {
reg = <ADC5_AMUX_THM5_100K_PU>;
label = "quiet_therm";
qcom,ratiometric;
qcom,hw-settle-time = <200>;
};
adc-chan@83 {
channel@83 {
reg = <ADC5_VPH_PWR>;
label = "vph_pwr";
qcom,ratiometric;
qcom,hw-settle-time = <200>;
};
adc-chan@85 {
channel@85 {
reg = <ADC5_VCOIN>;
label = "vcoin";
qcom,ratiometric;
......
arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
View file @ 41c18552
......@@ -183,39 +183,44 @@ &pm6125_adc {
pinctrl-names = "default";
pinctrl-0 = <&camera_flash_therm &emmc_ufs_therm &rf_pa1_therm>;
rf-pa0-therm@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "rf_pa0_therm";
};
quiet-therm@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "quiet_therm";
};
camera-flash-therm@52 {
channel@52 {
reg = <ADC5_GPIO1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "camera_flash_therm";
};
emmc-ufs-therm@54 {
channel@54 {
reg = <ADC5_GPIO3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "emmc_ufs_therm";
};
rf-pa1-therm@55 {
channel@55 {
reg = <ADC5_GPIO4_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
qcom,pre-scaling = <1 1>;
label = "rf_pa1_therm";
};
};
......
arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
View file @ 41c18552
......@@ -476,7 +476,7 @@ &pm6350_resin {
};
&pm7250b_adc {
adc-chan@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
......@@ -484,7 +484,7 @@ adc-chan@4d {
label = "charger_skin_therm";
};
adc-chan@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
......@@ -516,7 +516,7 @@ &pmk8350_rtc {
};
&pmk8350_vadc {
adc-chan@644 {
channel@644 {
reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
......
arch/arm64/boot/dts/qcom/sm8250-mtp.dts
View file @ 41c18552
......@@ -526,22 +526,25 @@ &i2c15 {
};
&pm8150_adc {
xo-therm@4c {
channel@4c {
reg = <ADC5_XO_THERM_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "xo_therm";
};
skin-therm@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "skin_therm";
};
pa-therm1@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "pa_therm1";
};
};
......@@ -571,10 +574,11 @@ pa-therm1@2 {
};
&pm8150b_adc {
conn-therm@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "conn_therm";
};
};
......@@ -615,22 +619,25 @@ pa-therm2@2 {
};
&pm8150l_adc {
camera-flash-therm@4d {
channel@4d {
reg = <ADC5_AMUX_THM1_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "camera_flash_therm";
};
skin-msm-therm@4e {
channel@4e {
reg = <ADC5_AMUX_THM2_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "skin_msm_therm";
};
pa-therm2@4f {
channel@4f {
reg = <ADC5_AMUX_THM3_100K_PU>;
qcom,ratiometric;
qcom,hw-settle-time = <200>;
label = "pa_therm2";
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7