On 05/13/2017 04:33 PM, Andreas Färber wrote: > Sort nodes referenced by label alphabetically. > > Signed-off-by: Andreas Färber <afaerber@xxxxxxx> > --- > v1 -> v2: > * Rebased (new nodes added) > > .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 86 +++++++++++----------- > 1 file changed, 43 insertions(+), 43 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > index 920fac10de93..5f626d683088 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > @@ -113,10 +113,49 @@ > }; > }; > > -&uart_AO { > +&cvbs_vdac_port { > + cvbs_vdac_out: endpoint { > + remote-endpoint = <&cvbs_connector_in>; > + }; > +}; > + > +ðmac { > status = "okay"; > - pinctrl-0 = <&uart_ao_a_pins>; > + > + pinctrl-0 = <ð_pins>; > pinctrl-names = "default"; > + > + /* Select external PHY by default */ > + phy-handle = <&external_phy>; > + > + amlogic,tx-delay-ns = <2>; > + > + snps,reset-gpio = <&gpio GPIOZ_14 0>; > + snps,reset-delays-us = <0 10000 1000000>; > + snps,reset-active-low; > + > + /* External PHY is in RGMII */ > + phy-mode = "rgmii"; > +}; > + > +&external_mdio { > + external_phy: ethernet-phy@0 { > + compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22"; > + reg = <0>; > + max-speed = <1000>; > + }; > +}; > + > +&hdmi_tx { > + status = "okay"; > + pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-names = "default"; > +}; > + > +&hdmi_tx_tmds_port { > + hdmi_tx_tmds_out: endpoint { > + remote-endpoint = <&hdmi_connector_in>; > + }; > }; > > &ir { > @@ -163,47 +202,8 @@ > vqmmc-supply = <&vddio_boot>; > }; > > -ðmac { > - status = "okay"; > - > - pinctrl-0 = <ð_pins>; > - pinctrl-names = "default"; > - > - /* Select external PHY by default */ > - phy-handle = <&external_phy>; > - > - amlogic,tx-delay-ns = <2>; > - > - snps,reset-gpio = <&gpio GPIOZ_14 0>; > - snps,reset-delays-us = <0 10000 1000000>; > - snps,reset-active-low; > - > - /* External PHY is in RGMII */ > - phy-mode = "rgmii"; > -}; > - > -&external_mdio { > - external_phy: ethernet-phy@0 { > - compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22"; > - reg = <0>; > - max-speed = <1000>; > - }; > -}; > - > -&cvbs_vdac_port { > - cvbs_vdac_out: endpoint { > - remote-endpoint = <&cvbs_connector_in>; > - }; > -}; > - > -&hdmi_tx { > +&uart_AO { > status = "okay"; > - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; > + pinctrl-0 = <&uart_ao_a_pins>; > pinctrl-names = "default"; > }; > - > -&hdmi_tx_tmds_port { > - hdmi_tx_tmds_out: endpoint { > - remote-endpoint = <&hdmi_connector_in>; > - }; > -}; > Hi Andreas, Like a previous attempt, I'm not OK with such rework since it will break bisect and add complexity for new patches handling. The order is not alphabetically ordered, live with it. Neil -- 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