On 01/20/2017 11:21 PM, Andreas Färber wrote: > Sort nodes referenced by label alphabetically. > > Signed-off-by: Andreas Färber <afaerber@xxxxxxx> > --- > .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 24 +++++++++++----------- > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi > index 419c46cc64e4..cfc26a2a3a90 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi > @@ -100,11 +100,8 @@ > }; > }; > > -/* This UART is brought out to the DB9 connector */ > -&uart_AO { > +ðmac { > status = "okay"; > - pinctrl-0 = <&uart_ao_a_pins>; > - pinctrl-names = "default"; > }; > > &ir { > @@ -113,6 +110,14 @@ > pinctrl-names = "default"; > }; > > +&pwm_ef { > + status = "okay"; > + pinctrl-0 = <&pwm_e_pins>; > + pinctrl-names = "default"; > + clocks = <&clkc CLKID_FCLK_DIV4>; > + clock-names = "clkin0"; > +}; > + > /* Wireless SDIO Module */ > &sd_emmc_a { > status = "okay"; > @@ -177,14 +182,9 @@ > vqmmc-supply = <&vddio_boot>; > }; > > -&pwm_ef { > +/* This UART is brought out to the DB9 connector */ > +&uart_AO { > status = "okay"; > - pinctrl-0 = <&pwm_e_pins>; > + pinctrl-0 = <&uart_ao_a_pins>; > pinctrl-names = "default"; > - clocks = <&clkc CLKID_FCLK_DIV4>; > - clock-names = "clkin0"; > -}; > - > -ðmac { > - status = "okay"; > }; > Reviewed-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html