summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBoris BREZILLON <b.brezillon.dev@gmail.com>2014-03-10 15:37:18 +0100
committerOlof Johansson <olof@lixom.net>2014-03-11 20:49:10 +0100
commitf656d46bbb2d3ecdb71c998ccf657dccea8d19a9 (patch)
treedabd9f63452860fd961a9bf44844e3fcdfb0fc68 /arch
parentMAINTAINERS: update IMX kernel git tree (diff)
downloadlinux-f656d46bbb2d3ecdb71c998ccf657dccea8d19a9.tar.xz
linux-f656d46bbb2d3ecdb71c998ccf657dccea8d19a9.zip
ARM: at91: fix network interface ordering for sama5d36
On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network interfaces are probed in a different order than for the sama5d35. Moreover, users are accustomed to this order in bootloaders and backports for older kernel revisions. So this patch switches DT node order as it is done for the other dual-Ethernet sama5d3 SoC. Better interface numbering which does not depend on DT node order is being developed for stronger interface identification. Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sama5d36.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d36.dtsi b/arch/arm/boot/dts/sama5d36.dtsi
index 6c31c26e6cc0..db58cad6acd3 100644
--- a/arch/arm/boot/dts/sama5d36.dtsi
+++ b/arch/arm/boot/dts/sama5d36.dtsi
@@ -8,8 +8,8 @@
*/
#include "sama5d3.dtsi"
#include "sama5d3_can.dtsi"
-#include "sama5d3_emac.dtsi"
#include "sama5d3_gmac.dtsi"
+#include "sama5d3_emac.dtsi"
#include "sama5d3_lcd.dtsi"
#include "sama5d3_mci2.dtsi"
#include "sama5d3_tcb1.dtsi"