| Message ID | 1386350983-13281-11-git-send-email-wens@csie.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Chen-Yu, On Sat, Dec 07, 2013 at 01:29:43AM +0800, Chen-Yu Tsai wrote: > U-Boot will insert MAC address into the device tree image. > It looks up ethernet[0-5] aliases to find the ethernet nodes. > Alias GMAC as ethernet0, as it is the only ethernet controller used. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- > arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > index 64b1391..f7c57c6 100644 > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -16,6 +16,10 @@ > / { > interrupt-parent = <&gic>; > > + aliases { > + ethernet0 = &gmac; > + }; > + Actually, it conflicts with http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/211695.html Please rebase accordingly. Thanks, Maxime
I will rebase onto 3.13-rc3 or 3.13 when it comes out. On Sat, Dec 7, 2013 at 6:15 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Hi Chen-Yu, > > On Sat, Dec 07, 2013 at 01:29:43AM +0800, Chen-Yu Tsai wrote: >> U-Boot will insert MAC address into the device tree image. >> It looks up ethernet[0-5] aliases to find the ethernet nodes. >> Alias GMAC as ethernet0, as it is the only ethernet controller used. >> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org> >> --- >> arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi >> index 64b1391..f7c57c6 100644 >> --- a/arch/arm/boot/dts/sun7i-a20.dtsi >> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi >> @@ -16,6 +16,10 @@ >> / { >> interrupt-parent = <&gic>; >> >> + aliases { >> + ethernet0 = &gmac; >> + }; >> + > > Actually, it conflicts with > http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/211695.html > > Please rebase accordingly. > > Thanks, > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 64b1391..f7c57c6 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -16,6 +16,10 @@ / { interrupt-parent = <&gic>; + aliases { + ethernet0 = &gmac; + }; + cpus { #address-cells = <1>; #size-cells = <0>;
U-Boot will insert MAC address into the device tree image. It looks up ethernet[0-5] aliases to find the ethernet nodes. Alias GMAC as ethernet0, as it is the only ethernet controller used. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++++ 1 file changed, 4 insertions(+)