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

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

diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index ca38200..db5b9f6 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -141,6 +141,10 @@
                                bm,pool-short = <3>;
                        };
 
+                       usb@58000 {
+                               status = "okay";
+                       };
+
                        /* CON4 */
                        ethernet@70000 {
                                pinctrl-names = "default";
@@ -164,15 +168,35 @@
 
                        nfc: flash@d0000 {
                                status = "okay";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
                                num-cs = <1>;
                                nand-ecc-strength = <4>;
                                nand-ecc-step-size = <512>;
                                marvell,nand-keep-config;
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
+
+                               partitions {
+                                       compatible = "fixed-partitions";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       partition@0 {
+                                               label = "U-Boot";
+                                               reg = <0x00000000 0x00800000>;
+                                               read-only;
+                                       };
+
+                                       partition@800000 {
+                                               label = "uImage";
+                                               reg = <0x00800000 0x00400000>;
+                                               read-only;
+                                       };
+
+                                       partition@c00000 {
+                                               label = "Root";
+                                               reg = <0x00c00000 0x3f400000>;
+                                       };
+                               };
                        };
 
                        usb3@f0000 {