ARM: dts: ixp4xx: Move EPBX100 flash to external bus node

This moves the EPBX100 flash under the external bus on CS0
like on the other IXP4xx systems.

Cc: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts b/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts
index 84158503be2ac02b0dd1133468fb3b4b86fef5ef..220605e297c344ed3ac3781aa4d69aec3a0512fe 100644 (file)
--- a/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts
+++ b/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts
@@ -28,48 +28,52 @@
                serial0 = &uart0;
        };
 
-       flash@50000000 {
-               compatible = "intel,ixp4xx-flash", "cfi-flash";
-               bank-width = <2>;
-               /*
-                * 16 MB of Flash
-                */
-               reg = <0x50000000 0x1000000>;
+       soc {
+               bus@50000000 {
+                       flash@0 {
+                               compatible = "intel,ixp4xx-flash", "cfi-flash";
+                               bank-width = <2>;
+                               /*
+                                * 16 MB of Flash
+                                */
+                               reg = <0x00000000 0x1000000>;
 
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                               partitions {
+                                       compatible = "fixed-partitions";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                       partition@0 {
-                               label = "RedBoot";
-                               reg = <0x00000000 0x00080000>;
-                               read-only;
-                       };
-                       partition@80000 {
-                               label = "zImage";
-                               reg = <0x00080000 0x00100000>;
-                               read-only;
-                       };
-                       partition@180000 {
-                               label = "ramdisk";
-                               reg = <0x00180000 0x00300000>;
-                               read-only;
-                       };
-                       partition@480000 {
-                               label = "User";
-                               reg = <0x00480000 0x00b60000>;
-                               read-only;
-                       };
-                       partition@fe0000 {
-                               label = "FIS directory";
-                               reg = <0x00fe0000 0x001f000>;
-                               read-only;
-                       };
-                       partition@fff000 {
-                               label = "RedBoot config";
-                               reg = <0x00fff000 0x0001000>;
-                               read-only;
+                                       partition@0 {
+                                               label = "RedBoot";
+                                               reg = <0x00000000 0x00080000>;
+                                               read-only;
+                                       };
+                                       partition@80000 {
+                                               label = "zImage";
+                                               reg = <0x00080000 0x00100000>;
+                                               read-only;
+                                       };
+                                       partition@180000 {
+                                               label = "ramdisk";
+                                               reg = <0x00180000 0x00300000>;
+                                               read-only;
+                                       };
+                                       partition@480000 {
+                                               label = "User";
+                                               reg = <0x00480000 0x00b60000>;
+                                               read-only;
+                                       };
+                                       partition@fe0000 {
+                                               label = "FIS directory";
+                                               reg = <0x00fe0000 0x001f000>;
+                                               read-only;
+                                       };
+                                       partition@fff000 {
+                                               label = "RedBoot config";
+                                               reg = <0x00fff000 0x0001000>;
+                                               read-only;
+                                       };
+                               };
                        };
                };
        };