1 From 1028055490cf9d6e146f57d920e8cfff4eda37e2 Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Fri, 14 Jun 2013 10:34:45 -0300
4 Subject: [PATCH 057/203] ARM: mvebu: Add BootROM to Armada 370/XP device tree
6 In order to access the SoC BootROM, we need to declare a mapping
7 (through a ranges property). The mbus driver will use this property
8 to allocate a suitable address decoding window.
10 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
11 Tested-by: Andrew Lunn <andrew@lunn.ch>
12 Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
14 arch/arm/boot/dts/armada-370-db.dts | 3 ++-
15 arch/arm/boot/dts/armada-370-mirabox.dts | 3 ++-
16 arch/arm/boot/dts/armada-370-rd.dts | 3 ++-
17 arch/arm/boot/dts/armada-370.dtsi | 5 +++++
18 arch/arm/boot/dts/armada-xp-db.dts | 3 ++-
19 arch/arm/boot/dts/armada-xp-gp.dts | 3 ++-
20 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 ++-
21 arch/arm/boot/dts/armada-xp.dtsi | 5 +++++
22 8 files changed, 22 insertions(+), 6 deletions(-)
24 --- a/arch/arm/boot/dts/armada-370-db.dts
25 +++ b/arch/arm/boot/dts/armada-370-db.dts
30 - ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
31 + ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
32 + MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
36 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
37 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
42 - ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
43 + ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
44 + MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
48 --- a/arch/arm/boot/dts/armada-370-rd.dts
49 +++ b/arch/arm/boot/dts/armada-370-rd.dts
54 - ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000>;
55 + ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
56 + MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
60 --- a/arch/arm/boot/dts/armada-370.dtsi
61 +++ b/arch/arm/boot/dts/armada-370.dtsi
64 compatible = "marvell,armada370-mbus", "simple-bus";
67 + compatible = "marvell,bootrom";
68 + reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;
72 system-controller@18200 {
73 compatible = "marvell,armada-370-xp-system-controller";
74 --- a/arch/arm/boot/dts/armada-xp-db.dts
75 +++ b/arch/arm/boot/dts/armada-xp-db.dts
80 - ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
81 + ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
82 + MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
86 --- a/arch/arm/boot/dts/armada-xp-gp.dts
87 +++ b/arch/arm/boot/dts/armada-xp-gp.dts
92 - ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
93 + ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
94 + MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
98 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
99 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
104 - ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000>;
105 + ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
106 + MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
110 --- a/arch/arm/boot/dts/armada-xp.dtsi
111 +++ b/arch/arm/boot/dts/armada-xp.dtsi
114 compatible = "marvell,armadaxp-mbus", "simple-bus";
117 + compatible = "marvell,bootrom";
118 + reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>;
123 compatible = "marvell,aurora-system-cache";