Message ID | 20170120222118.21476-18-afaerber@suse.de (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On 01/20/2017 11:21 PM, Andreas Färber wrote: > Sort nodes referenced by label alphabetically. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 58 +++++++++++----------- > 1 file changed, 29 insertions(+), 29 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 439060652689..804e8de80f37 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts > @@ -102,10 +102,35 @@ > }; > }; > > -&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>; > + > + 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>; > + }; > }; > > &ir { > @@ -152,33 +177,8 @@ > vqmmc-supply = <&vddio_boot>; > }; > > -ðmac { > +&uart_AO { > status = "okay"; > - > - pinctrl-0 = <ð_pins>; > + pinctrl-0 = <&uart_ao_a_pins>; > pinctrl-names = "default"; > - > - /* Select external PHY by default */ > - phy-handle = <&external_phy>; > - > - 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>; > - }; > }; > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
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 439060652689..804e8de80f37 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -102,10 +102,35 @@ }; }; -&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>; + + 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>; + }; }; &ir { @@ -152,33 +177,8 @@ vqmmc-supply = <&vddio_boot>; }; -ðmac { +&uart_AO { status = "okay"; - - pinctrl-0 = <ð_pins>; + pinctrl-0 = <&uart_ao_a_pins>; pinctrl-names = "default"; - - /* Select external PHY by default */ - phy-handle = <&external_phy>; - - 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>; - }; };
Sort nodes referenced by label alphabetically. Signed-off-by: Andreas Färber <afaerber@suse.de> --- .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 58 +++++++++++----------- 1 file changed, 29 insertions(+), 29 deletions(-)