Am 28.11.2016 um 10:46 schrieb Jerome Brunet: > Signed-off-by: Jerome Brunet <jbru...@baylibre.com> > --- > arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > index e6e3491d48a5..5624714d2b16 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts > @@ -46,6 +46,7 @@ > > #include "meson-gxbb.dtsi" > #include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/net/mdio.h> > > / { > compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb"; > @@ -98,3 +99,18 @@ > pinctrl-0 = <&i2c_a_pins>; > pinctrl-names = "default"; > }; > + > +ðmac { > + phy-handle = <ð_phy0>; > + > + mdio { > + compatible = "snps,dwmac-mdio"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + eth_phy0: ethernet-phy@0 { > + reg = <0>; > + eee-broken-modes = <MDIO_EEE_1000T>; > + }; > + }; > +};
I've tested this hand-applied because it applies to neither amlogic v4.10/integ nor linux-next.git and will conflict if applied through the net-next tree. Note that there already is an ðmac node that you should be extending rather than duplicating: ðmac { status = "okay"; pinctrl-0 = <ð_rgmii_pins>; pinctrl-names = "default"; }; If you or your colleagues could please fix the sort order of the nodes to be alphabetical again (ethmac after i2c_A here; between uart_A and ir in-tree) this wouldn't happen so easily again. I therefore suggest to not apply this patch 4/4 through net-next but through the amlogic tree instead. Thanks, Andreas -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg)