3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
91 lines
2.2 KiB
Diff
91 lines
2.2 KiB
Diff
From cc4fb487fbf95c97b40e1e8e5b8b2ddabc8d124d Mon Sep 17 00:00:00 2001
|
|
From: Willy Tarreau <w@1wt.eu>
|
|
Date: Mon, 3 Jun 2013 18:47:36 +0200
|
|
Subject: [PATCH 067/203] ARM: mvebu: set aliases for ethernet controllers
|
|
|
|
These aliases are used when feeding the DT from ATAGS to set the
|
|
devices MAC addresses.
|
|
|
|
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/boot/dts/armada-370-xp.dtsi | 9 +++++++--
|
|
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 3 ++-
|
|
arch/arm/boot/dts/armada-xp.dtsi | 6 +++++-
|
|
3 files changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
@@ -24,6 +24,11 @@
|
|
model = "Marvell Armada 370 and XP SoC";
|
|
compatible = "marvell,armada-370-xp";
|
|
|
|
+ aliases {
|
|
+ eth0 = ð0;
|
|
+ eth1 = ð1;
|
|
+ };
|
|
+
|
|
cpus {
|
|
cpu@0 {
|
|
compatible = "marvell,sheeva-v7";
|
|
@@ -151,7 +156,7 @@
|
|
reg = <0x72004 0x4>;
|
|
};
|
|
|
|
- ethernet@70000 {
|
|
+ eth0: ethernet@70000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
reg = <0x70000 0x4000>;
|
|
interrupts = <8>;
|
|
@@ -159,7 +164,7 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- ethernet@74000 {
|
|
+ eth1: ethernet@74000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
reg = <0x74000 0x4000>;
|
|
interrupts = <10>;
|
|
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
|
|
@@ -23,6 +23,7 @@
|
|
gpio0 = &gpio0;
|
|
gpio1 = &gpio1;
|
|
gpio2 = &gpio2;
|
|
+ eth3 = ð3;
|
|
};
|
|
|
|
|
|
@@ -326,7 +327,7 @@
|
|
interrupts = <91>;
|
|
};
|
|
|
|
- ethernet@34000 {
|
|
+ eth3: ethernet@34000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
reg = <0x34000 0x4000>;
|
|
interrupts = <14>;
|
|
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
|
@@ -22,6 +22,10 @@
|
|
model = "Marvell Armada XP family SoC";
|
|
compatible = "marvell,armadaxp", "marvell,armada-370-xp";
|
|
|
|
+ aliases {
|
|
+ eth2 = ð2;
|
|
+ };
|
|
+
|
|
soc {
|
|
compatible = "marvell,armadaxp-mbus", "simple-bus";
|
|
|
|
@@ -93,7 +97,7 @@
|
|
reg = <0x18200 0x500>;
|
|
};
|
|
|
|
- ethernet@30000 {
|
|
+ eth2: ethernet@30000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
reg = <0x30000 0x4000>;
|
|
interrupts = <12>;
|