| Message ID | 20230702134320.98831-16-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: > Move pm8058 device nodes to follow the alphanumberic sorting order. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm/boot/dts/qcom/pm8058.dtsi | 90 +++++++++++++++--------------- > 1 file changed, 45 insertions(+), 45 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi > index ad581c3bcbd2..913a511719fa 100644 > --- a/arch/arm/boot/dts/qcom/pm8058.dtsi > +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi > @@ -8,15 +8,24 @@ pm8058: pmic { > #address-cells = <1>; > #size-cells = <0>; > > - pm8058_gpio: gpio@150 { > - compatible = "qcom,pm8058-gpio", > - "qcom,ssbi-gpio"; > - reg = <0x150>; > - interrupt-controller; > - #interrupt-cells = <2>; > - gpio-controller; > - gpio-ranges = <&pm8058_gpio 0 0 44>; > - #gpio-cells = <2>; > + pwrkey@1c { > + compatible = "qcom,pm8058-pwrkey"; > + reg = <0x1c>; > + interrupt-parent = <&pm8058>; > + interrupts = <50 1>, <51 1>; > + debounce = <15625>; > + pull-up; > + }; > + > + pm8058_led48: led@48 { > + compatible = "qcom,pm8058-keypad-led"; > + reg = <0x48>; > + status = "disabled"; > + }; > + > + vibrator@4a { > + compatible = "qcom,pm8058-vib"; > + reg = <0x4a>; > }; > > pm8058_mpps: mpps@50 { > @@ -30,13 +39,22 @@ pm8058_mpps: mpps@50 { > #interrupt-cells = <2>; > }; > > - pwrkey@1c { > - compatible = "qcom,pm8058-pwrkey"; > - reg = <0x1c>; > - interrupt-parent = <&pm8058>; > - interrupts = <50 1>, <51 1>; > - debounce = <15625>; > - pull-up; > + pm8058_led131: led@131 { > + compatible = "qcom,pm8058-led"; > + reg = <0x131>; > + status = "disabled"; > + }; > + > + pm8058_led132: led@132 { > + compatible = "qcom,pm8058-led"; > + reg = <0x132>; > + status = "disabled"; > + }; > + > + pm8058_led133: led@133 { > + compatible = "qcom,pm8058-led"; > + reg = <0x133>; > + status = "disabled"; > }; > > pm8058_keypad: keypad@148 { > @@ -49,6 +67,17 @@ pm8058_keypad: keypad@148 { > row-hold = <91500>; > }; > > + pm8058_gpio: gpio@150 { > + compatible = "qcom,pm8058-gpio", > + "qcom,ssbi-gpio"; > + reg = <0x150>; > + interrupt-controller; > + #interrupt-cells = <2>; > + gpio-controller; > + gpio-ranges = <&pm8058_gpio 0 0 44>; > + #gpio-cells = <2>; > + }; > + > pm8058_xoadc: xoadc@197 { > compatible = "qcom,pm8058-adc"; > reg = <0x197>; > @@ -109,35 +138,6 @@ rtc@1e8 { > interrupts = <39 1>; > allow-set-time; > }; > - > - vibrator@4a { > - compatible = "qcom,pm8058-vib"; > - reg = <0x4a>; > - }; > - > - pm8058_led48: led@48 { > - compatible = "qcom,pm8058-keypad-led"; > - reg = <0x48>; > - status = "disabled"; > - }; > - > - pm8058_led131: led@131 { > - compatible = "qcom,pm8058-led"; > - reg = <0x131>; > - status = "disabled"; > - }; > - > - pm8058_led132: led@132 { > - compatible = "qcom,pm8058-led"; > - reg = <0x132>; > - status = "disabled"; > - }; > - > - pm8058_led133: led@133 { > - compatible = "qcom,pm8058-led"; > - reg = <0x133>; > - status = "disabled"; > - }; > }; > }; >
diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi index ad581c3bcbd2..913a511719fa 100644 --- a/arch/arm/boot/dts/qcom/pm8058.dtsi +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi @@ -8,15 +8,24 @@ pm8058: pmic { #address-cells = <1>; #size-cells = <0>; - pm8058_gpio: gpio@150 { - compatible = "qcom,pm8058-gpio", - "qcom,ssbi-gpio"; - reg = <0x150>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - gpio-ranges = <&pm8058_gpio 0 0 44>; - #gpio-cells = <2>; + pwrkey@1c { + compatible = "qcom,pm8058-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pm8058>; + interrupts = <50 1>, <51 1>; + debounce = <15625>; + pull-up; + }; + + pm8058_led48: led@48 { + compatible = "qcom,pm8058-keypad-led"; + reg = <0x48>; + status = "disabled"; + }; + + vibrator@4a { + compatible = "qcom,pm8058-vib"; + reg = <0x4a>; }; pm8058_mpps: mpps@50 { @@ -30,13 +39,22 @@ pm8058_mpps: mpps@50 { #interrupt-cells = <2>; }; - pwrkey@1c { - compatible = "qcom,pm8058-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pm8058>; - interrupts = <50 1>, <51 1>; - debounce = <15625>; - pull-up; + pm8058_led131: led@131 { + compatible = "qcom,pm8058-led"; + reg = <0x131>; + status = "disabled"; + }; + + pm8058_led132: led@132 { + compatible = "qcom,pm8058-led"; + reg = <0x132>; + status = "disabled"; + }; + + pm8058_led133: led@133 { + compatible = "qcom,pm8058-led"; + reg = <0x133>; + status = "disabled"; }; pm8058_keypad: keypad@148 { @@ -49,6 +67,17 @@ pm8058_keypad: keypad@148 { row-hold = <91500>; }; + pm8058_gpio: gpio@150 { + compatible = "qcom,pm8058-gpio", + "qcom,ssbi-gpio"; + reg = <0x150>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + gpio-ranges = <&pm8058_gpio 0 0 44>; + #gpio-cells = <2>; + }; + pm8058_xoadc: xoadc@197 { compatible = "qcom,pm8058-adc"; reg = <0x197>; @@ -109,35 +138,6 @@ rtc@1e8 { interrupts = <39 1>; allow-set-time; }; - - vibrator@4a { - compatible = "qcom,pm8058-vib"; - reg = <0x4a>; - }; - - pm8058_led48: led@48 { - compatible = "qcom,pm8058-keypad-led"; - reg = <0x48>; - status = "disabled"; - }; - - pm8058_led131: led@131 { - compatible = "qcom,pm8058-led"; - reg = <0x131>; - status = "disabled"; - }; - - pm8058_led132: led@132 { - compatible = "qcom,pm8058-led"; - reg = <0x132>; - status = "disabled"; - }; - - pm8058_led133: led@133 { - compatible = "qcom,pm8058-led"; - reg = <0x133>; - status = "disabled"; - }; }; };
Move pm8058 device nodes to follow the alphanumberic sorting order. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm/boot/dts/qcom/pm8058.dtsi | 90 +++++++++++++++--------------- 1 file changed, 45 insertions(+), 45 deletions(-)