diff options
author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
commit | 3af779eb172b0438f77e8a01a97dd0eb9a146076 (patch) | |
tree | 23838dbde109e79f4c4763dbf78a983aeeefafe1 /target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch | |
parent | 69d323f23119ce6986c2803f34d95869144a00e6 (diff) | |
download | upstream-3af779eb172b0438f77e8a01a97dd0eb9a146076.tar.gz upstream-3af779eb172b0438f77e8a01a97dd0eb9a146076.tar.bz2 upstream-3af779eb172b0438f77e8a01a97dd0eb9a146076.zip |
mvebu: backport mainline patches from kernel 3.12
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
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch b/target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch new file mode 100644 index 0000000000..c1509663b3 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch @@ -0,0 +1,123 @@ +From 1028055490cf9d6e146f57d920e8cfff4eda37e2 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Fri, 14 Jun 2013 10:34:45 -0300 +Subject: [PATCH 057/203] ARM: mvebu: Add BootROM to Armada 370/XP device tree + +In order to access the SoC BootROM, we need to declare a mapping +(through a ranges property). The mbus driver will use this property +to allocate a suitable address decoding window. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Tested-by: Andrew Lunn <andrew@lunn.ch> +Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +--- + arch/arm/boot/dts/armada-370-db.dts | 3 ++- + arch/arm/boot/dts/armada-370-mirabox.dts | 3 ++- + arch/arm/boot/dts/armada-370-rd.dts | 3 ++- + arch/arm/boot/dts/armada-370.dtsi | 5 +++++ + arch/arm/boot/dts/armada-xp-db.dts | 3 ++- + arch/arm/boot/dts/armada-xp-gp.dts | 3 ++- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 ++- + arch/arm/boot/dts/armada-xp.dtsi | 5 +++++ + 8 files changed, 22 insertions(+), 6 deletions(-) + +--- a/arch/arm/boot/dts/armada-370-db.dts ++++ b/arch/arm/boot/dts/armada-370-db.dts +@@ -30,7 +30,8 @@ + }; + + soc { +- ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>; ++ ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 ++ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; + + internal-regs { + serial@12000 { +--- a/arch/arm/boot/dts/armada-370-mirabox.dts ++++ b/arch/arm/boot/dts/armada-370-mirabox.dts +@@ -25,7 +25,8 @@ + }; + + soc { +- ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>; ++ ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 ++ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; + + internal-regs { + serial@12000 { +--- a/arch/arm/boot/dts/armada-370-rd.dts ++++ b/arch/arm/boot/dts/armada-370-rd.dts +@@ -28,7 +28,8 @@ + }; + + soc { +- ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>; ++ ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000 ++ MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>; + + internal-regs { + serial@12000 { +--- a/arch/arm/boot/dts/armada-370.dtsi ++++ b/arch/arm/boot/dts/armada-370.dtsi +@@ -31,6 +31,11 @@ + soc { + compatible = "marvell,armada370-mbus", "simple-bus"; + ++ bootrom { ++ compatible = "marvell,bootrom"; ++ reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>; ++ }; ++ + internal-regs { + system-controller@18200 { + compatible = "marvell,armada-370-xp-system-controller"; +--- a/arch/arm/boot/dts/armada-xp-db.dts ++++ b/arch/arm/boot/dts/armada-xp-db.dts +@@ -30,7 +30,8 @@ + }; + + soc { +- ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>; ++ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 ++ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; + + internal-regs { + serial@12000 { +--- a/arch/arm/boot/dts/armada-xp-gp.dts ++++ b/arch/arm/boot/dts/armada-xp-gp.dts +@@ -39,7 +39,8 @@ + }; + + soc { +- ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>; ++ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 ++ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; + + internal-regs { + serial@12000 { +--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts ++++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +@@ -27,7 +27,8 @@ + }; + + soc { +- ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>; ++ ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 ++ MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; + + internal-regs { + serial@12000 { +--- a/arch/arm/boot/dts/armada-xp.dtsi ++++ b/arch/arm/boot/dts/armada-xp.dtsi +@@ -25,6 +25,11 @@ + soc { + compatible = "marvell,armadaxp-mbus", "simple-bus"; + ++ bootrom { ++ compatible = "marvell,bootrom"; ++ reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>; ++ }; ++ + internal-regs { + L2: l2-cache { + compatible = "marvell,aurora-system-cache"; |