On 2.07.2023 15:43, Dmitry Baryshkov wrote: > Change PM8018 node labels to start with pm8018_ prefix, following other > Qualcomm PMIC device nodes. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx> Konrad > arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 2 +- > arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 14 +++++++------- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi > index 92c8003dac25..dac3aa793f71 100644 > --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi > +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi > @@ -76,7 +76,7 @@ reset-out-pins { > }; > }; > > -&pmicgpio { > +&pm8018_gpio { > usb_vbus_5v_pins: usb-vbus-5v-state { > pins = "gpio4"; > function = "normal"; > diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi > index b40c52ddf9b4..e79582c6220b 100644 > --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi > +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi > @@ -246,7 +246,7 @@ qcom,ssbi@500000 { > reg = <0x500000 0x1000>; > qcom,controller-type = "pmic-arbiter"; > > - pmicintc: pmic { > + pm8018: pmic { > compatible = "qcom,pm8018", "qcom,pm8921"; > interrupts = <GIC_PPI 226 IRQ_TYPE_LEVEL_HIGH>; > #interrupt-cells = <2>; > @@ -257,38 +257,38 @@ pmicintc: pmic { > pwrkey@1c { > compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey"; > reg = <0x1c>; > - interrupt-parent = <&pmicintc>; > + interrupt-parent = <&pm8018>; > interrupts = <50 IRQ_TYPE_EDGE_RISING>, > <51 IRQ_TYPE_EDGE_RISING>; > debounce = <15625>; > pull-up; > }; > > - pmicmpp: mpps@50 { > + pm8018_mpps: mpps@50 { > compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp"; > interrupt-controller; > #interrupt-cells = <2>; > reg = <0x50>; > gpio-controller; > #gpio-cells = <2>; > - gpio-ranges = <&pmicmpp 0 0 6>; > + gpio-ranges = <&pm8018_mpps 0 0 6>; > }; > > rtc@11d { > compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; > - interrupt-parent = <&pmicintc>; > + interrupt-parent = <&pm8018>; > interrupts = <39 IRQ_TYPE_EDGE_RISING>; > reg = <0x11d>; > allow-set-time; > }; > > - pmicgpio: gpio@150 { > + pm8018_gpio: gpio@150 { > compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio"; > reg = <0x150>; > interrupt-controller; > #interrupt-cells = <2>; > gpio-controller; > - gpio-ranges = <&pmicgpio 0 0 6>; > + gpio-ranges = <&pm8018_gpio 0 0 6>; > #gpio-cells = <2>; > }; > };