| Message ID | 20230702134320.98831-10-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: dts: qcom: cleanup PMIC usage | expand |
On 2.07.2023 15:43, Dmitry Baryshkov wrote: > Change PM8058 node labels to start with pm8058_ prefix, following other > Qualcomm PMIC device nodes. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > .../boot/dts/qcom/qcom-apq8060-dragonboard.dts | 4 ++-- > arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 16 ++++++++-------- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts > index db4c791b2e2f..48fd1a1feea3 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts > +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts > @@ -72,7 +72,7 @@ cm3605 { > /* Trig on both edges - getting close or far away */ > interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>; > /* MPP05 analog input to the XOADC */ > - io-channels = <&xoadc 0x00 0x05>; > + io-channels = <&pm8058_xoadc 0x00 0x05>; > io-channel-names = "aout"; > pinctrl-names = "default"; > pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>; > @@ -945,7 +945,7 @@ irq-pins { > }; > }; > > -&xoadc { > +&pm8058_xoadc { > /* Reference voltage 2.2 V */ > xoadc-ref-supply = <&pm8058_l18>; > > diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi > index 78023ed2fdf7..9217ced108c4 100644 > --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi > +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi > @@ -80,13 +80,13 @@ sleep-clk { > */ > iio-hwmon { > compatible = "iio-hwmon"; > - io-channels = <&xoadc 0x00 0x01>, /* Battery */ > - <&xoadc 0x00 0x02>, /* DC in (charger) */ > - <&xoadc 0x00 0x04>, /* VPH the main system voltage */ > - <&xoadc 0x00 0x0b>, /* Die temperature */ > - <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ > - <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ > - <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ > + io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */ > + <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */ > + <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */ > + <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */ > + <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ > + <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ > + <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ > }; > > soc: soc { > @@ -390,7 +390,7 @@ pm8058_keypad: keypad@148 { > row-hold = <91500>; > }; > > - xoadc: xoadc@197 { > + pm8058_xoadc: xoadc@197 { > compatible = "qcom,pm8058-adc"; > reg = <0x197>; > interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts index db4c791b2e2f..48fd1a1feea3 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts @@ -72,7 +72,7 @@ cm3605 { /* Trig on both edges - getting close or far away */ interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>; /* MPP05 analog input to the XOADC */ - io-channels = <&xoadc 0x00 0x05>; + io-channels = <&pm8058_xoadc 0x00 0x05>; io-channel-names = "aout"; pinctrl-names = "default"; pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>; @@ -945,7 +945,7 @@ irq-pins { }; }; -&xoadc { +&pm8058_xoadc { /* Reference voltage 2.2 V */ xoadc-ref-supply = <&pm8058_l18>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi index 78023ed2fdf7..9217ced108c4 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi @@ -80,13 +80,13 @@ sleep-clk { */ iio-hwmon { compatible = "iio-hwmon"; - io-channels = <&xoadc 0x00 0x01>, /* Battery */ - <&xoadc 0x00 0x02>, /* DC in (charger) */ - <&xoadc 0x00 0x04>, /* VPH the main system voltage */ - <&xoadc 0x00 0x0b>, /* Die temperature */ - <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ - <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ - <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ + io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */ + <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ }; soc: soc { @@ -390,7 +390,7 @@ pm8058_keypad: keypad@148 { row-hold = <91500>; }; - xoadc: xoadc@197 { + pm8058_xoadc: xoadc@197 { compatible = "qcom,pm8058-adc"; reg = <0x197>; interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>;
Change PM8058 node labels to start with pm8058_ prefix, following other Qualcomm PMIC device nodes. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- .../boot/dts/qcom/qcom-apq8060-dragonboard.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)