Merge branch 'pm-cpufreq'

[cascardo/linux.git] / arch / arm / boot / dts / armada-370-seagate-personal-cloud.dtsi

diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index 1aba08e..01cded3 100644 (file)
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -68,26 +68,6 @@
                                phy-mode = "rgmii-id";
                        };
 
-                       spi@10600 {
-                               status = "okay";
-                               pinctrl-0 = <&spi0_pins2>;
-                               pinctrl-names = "default";
-
-                               spi-flash@0 {
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       /* MX25L8006E */
-                                       compatible = "mxicy,mx25l8005", "jedec,spi-nor";
-                                       reg = <0>; /* Chip select 0 */
-                                       spi-max-frequency = <50000000>;
-
-                                       partition@0 {
-                                               label = "u-boot";
-                                               reg = <0x0 0x100000>;
-                                       };
-                               };
-                       };
-
                        usb@50000 {
                                status = "okay";
                        };
@@ -176,3 +156,23 @@
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "okay";
+       pinctrl-0 = <&spi0_pins2>;
+       pinctrl-names = "default";
+
+       spi-flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               /* MX25L8006E */
+               compatible = "mxicy,mx25l8005", "jedec,spi-nor";
+               reg = <0>; /* Chip select 0 */
+               spi-max-frequency = <50000000>;
+
+               partition@0 {
+                       label = "u-boot";
+                       reg = <0x0 0x100000>;
+               };
+       };
+};