target/linux/mvebu/patches-3.10/0057-ARM-mvebu-Add-BootROM-to-Armada-370-XP-device-tree.patch

   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
   5
   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.
   9
  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>
  13 ---
  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(-)
  23
  24 --- a/arch/arm/boot/dts/armada-370-db.dts
  25 +++ b/arch/arm/boot/dts/armada-370-db.dts
  26 @@ -30,7 +30,8 @@
  27         };
  28
  29         soc {
  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>;
  33
  34                 internal-regs {
  35                         serial@12000 {
  36 --- a/arch/arm/boot/dts/armada-370-mirabox.dts
  37 +++ b/arch/arm/boot/dts/armada-370-mirabox.dts
  38 @@ -25,7 +25,8 @@
  39         };
  40
  41         soc {
  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>;
  45
  46                 internal-regs {
  47                         serial@12000 {
  48 --- a/arch/arm/boot/dts/armada-370-rd.dts
  49 +++ b/arch/arm/boot/dts/armada-370-rd.dts
  50 @@ -28,7 +28,8 @@
  51         };
  52
  53         soc {
  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>;
  57
  58                 internal-regs {
  59                         serial@12000 {
  60 --- a/arch/arm/boot/dts/armada-370.dtsi
  61 +++ b/arch/arm/boot/dts/armada-370.dtsi
  62 @@ -31,6 +31,11 @@
  63         soc {
  64                 compatible = "marvell,armada370-mbus", "simple-bus";
  65
  66 +               bootrom {
  67 +                       compatible = "marvell,bootrom";
  68 +                       reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;
  69 +               };
  70 +
  71                 internal-regs {
  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
  76 @@ -30,7 +30,8 @@
  77         };
  78
  79         soc {
  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>;
  83
  84                 internal-regs {
  85                         serial@12000 {
  86 --- a/arch/arm/boot/dts/armada-xp-gp.dts
  87 +++ b/arch/arm/boot/dts/armada-xp-gp.dts
  88 @@ -39,7 +39,8 @@
  89         };
  90
  91         soc {
  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>;
  95
  96                 internal-regs {
  97                         serial@12000 {
  98 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
  99 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
 100 @@ -27,7 +27,8 @@
 101         };
 102
 103         soc {
 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>;
 107
 108                 internal-regs {
 109                         serial@12000 {
 110 --- a/arch/arm/boot/dts/armada-xp.dtsi
 111 +++ b/arch/arm/boot/dts/armada-xp.dtsi
 112 @@ -25,6 +25,11 @@
 113         soc {
 114                 compatible = "marvell,armadaxp-mbus", "simple-bus";
 115
 116 +               bootrom {
 117 +                       compatible = "marvell,bootrom";
 118 +                       reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>;
 119 +               };
 120 +
 121                 internal-regs {
 122                         L2: l2-cache {
 123                                 compatible = "marvell,aurora-system-cache";