| Message ID | 20230702134320.98831-8-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: qcom: cleanup PMIC usage | expand |
On 2.07.2023 15:43, Dmitry Baryshkov wrote: > Change PM8921 node labels to start with pm8921_ 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 > arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi > index 4f4393e11580..5ffb960d09b4 100644 > --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi > +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi > @@ -332,13 +332,13 @@ scm { > */ > 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>; /* Charger temperature */ > + io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */ > + <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */ > + <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */ > + <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */ > + <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ > + <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ > + <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */ > }; > > soc: soc { > @@ -714,7 +714,7 @@ ssbi@500000 { > reg = <0x00500000 0x1000>; > qcom,controller-type = "pmic-arbiter"; > > - pmicintc: pmic { > + pm8921: pmic { > compatible = "qcom,pm8921"; > interrupt-parent = <&tlmm_pinmux>; > interrupts = <74 8>; > @@ -749,7 +749,7 @@ pm8921_mpps: mpps@50 { > > rtc@11d { > compatible = "qcom,pm8921-rtc"; > - interrupt-parent = <&pmicintc>; > + interrupt-parent = <&pm8921>; > interrupts = <39 1>; > reg = <0x11d>; > allow-set-time; > @@ -758,16 +758,16 @@ rtc@11d { > pwrkey@1c { > compatible = "qcom,pm8921-pwrkey"; > reg = <0x1c>; > - interrupt-parent = <&pmicintc>; > + interrupt-parent = <&pm8921>; > interrupts = <50 1>, <51 1>; > debounce = <15625>; > pull-up; > }; > > - xoadc: xoadc@197 { > + pm8921_xoadc: xoadc@197 { > compatible = "qcom,pm8921-adc"; > reg = <0x197>; > - interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>; > + interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>; > #address-cells = <2>; > #size-cells = <0>; > #io-channel-cells = <2>;
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index 4f4393e11580..5ffb960d09b4 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -332,13 +332,13 @@ scm { */ 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>; /* Charger temperature */ + io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */ + <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */ }; soc: soc { @@ -714,7 +714,7 @@ ssbi@500000 { reg = <0x00500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic { + pm8921: pmic { compatible = "qcom,pm8921"; interrupt-parent = <&tlmm_pinmux>; interrupts = <74 8>; @@ -749,7 +749,7 @@ pm8921_mpps: mpps@50 { rtc@11d { compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <39 1>; reg = <0x11d>; allow-set-time; @@ -758,16 +758,16 @@ rtc@11d { pwrkey@1c { compatible = "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <50 1>, <51 1>; debounce = <15625>; pull-up; }; - xoadc: xoadc@197 { + pm8921_xoadc: xoadc@197 { compatible = "qcom,pm8921-adc"; reg = <0x197>; - interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>; #address-cells = <2>; #size-cells = <0>; #io-channel-cells = <2>;
Change PM8921 node labels to start with pm8921_ prefix, following other Qualcomm PMIC device nodes. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)