| Message ID | 20230617171541.286957-8-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 0ec3a3e1b84bc27d482a6cab4e7ab7e2dd26ecf6 |
| Headers | show |
| Series | [01/15] arm64: dts: qcom: msm8916-gt5: drop incorrect accelerometer interrupt-names | expand |
On 17.06.2023 19:15, Krzysztof Kozlowski wrote: > ADC channel node names were changed to require generic 'channel'. The > user-visible part is defined via label. > > sc7180-acer-aspire1.dtb: adc@3100: 'charger-thermistor@4f', 'thermistor@4e' do not match any of the regexes: '^channel@[0-9a-f]+$', 'pinctrl-[0-9]+' > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts > index b637b4270f88..dbb48934d499 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts > @@ -314,16 +314,18 @@ &mdss_dsi0_phy { > }; > > &pm6150_adc { > - thermistor@4e { > + channel@4e { > reg = <ADC5_AMUX_THM2_100K_PU>; > qcom,ratiometric; > qcom,hw-settle-time = <200>; > + label = "thermistor"; > }; > > - charger-thermistor@4f { > + channel@4f { > reg = <ADC5_AMUX_THM3_100K_PU>; > qcom,ratiometric; > qcom,hw-settle-time = <200>; > + label = "charger_thermistor"; > }; > }; >
diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index b637b4270f88..dbb48934d499 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -314,16 +314,18 @@ &mdss_dsi0_phy { }; &pm6150_adc { - thermistor@4e { + channel@4e { reg = <ADC5_AMUX_THM2_100K_PU>; qcom,ratiometric; qcom,hw-settle-time = <200>; + label = "thermistor"; }; - charger-thermistor@4f { + channel@4f { reg = <ADC5_AMUX_THM3_100K_PU>; qcom,ratiometric; qcom,hw-settle-time = <200>; + label = "charger_thermistor"; }; };
ADC channel node names were changed to require generic 'channel'. The user-visible part is defined via label. sc7180-acer-aspire1.dtb: adc@3100: 'charger-thermistor@4f', 'thermistor@4e' do not match any of the regexes: '^channel@[0-9a-f]+$', 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)