Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / armada-398-db.dts

diff --git a/arch/arm/boot/dts/armada-398-db.dts b/arch/arm/boot/dts/armada-398-db.dts
index 788c3ba..268c834 100644 (file)
--- a/arch/arm/boot/dts/armada-398-db.dts
+++ b/arch/arm/boot/dts/armada-398-db.dts
@@ -65,30 +65,6 @@
                          MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
 
                internal-regs {
-                       spi@10680 {
-                               status = "okay";
-                               pinctrl-0 = <&spi1_pins>;
-                               pinctrl-names = "default";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       compatible = "n25q128a13", "jedec,spi-nor";
-                                       reg = <0>;
-                                       spi-max-frequency = <108000000>;
-
-                                       partition@0 {
-                                               label = "U-Boot";
-                                               reg = <0 0x400000>;
-                                       };
-
-                                       partition@400000 {
-                                               label = "Filesystem";
-                                               reg = <0x400000 0x1000000>;
-                                       };
-                               };
-                       };
-
                        i2c@11000 {
                                pinctrl-0 = <&i2c0_pins>;
                                pinctrl-names = "default";
@@ -108,6 +84,10 @@
                                status = "okay";
                        };
 
+                       usb@58000 {
+                               status = "okay";
+                       };
+
                        flash@d0000 {
                                status = "okay";
                                pinctrl-0 = <&nand_pins>;
@@ -132,6 +112,10 @@
                                        reg = <0x1000000 0x3f000000>;
                                };
                        };
+
+                       usb3@f8000 {
+                               status = "okay";
+                       };
                };
 
                pcie-controller {
@@ -151,3 +135,27 @@
                };
        };
 };
+
+&spi1 {
+       status = "okay";
+       pinctrl-0 = <&spi1_pins>;
+       pinctrl-names = "default";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "n25q128a13", "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <108000000>;
+
+               partition@0 {
+                       label = "U-Boot";
+                       reg = <0 0x400000>;
+               };
+
+               partition@400000 {
+                       label = "Filesystem";
+                       reg = <0x400000 0x1000000>;
+               };
+       };
+};