Merge branch 'pm-cpufreq'

[cascardo/linux.git] / arch / arm / boot / dts / armada-385-linksys.dtsi

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 22f7a13..8f0e508 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -62,11 +62,6 @@
                          MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;
 
                internal-regs {
-
-                       spi@10600 {
-                               status = "disabled";
-                       };
-
                        i2c@11000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&i2c0_pins>;
@@ -332,3 +327,7 @@
                marvell,function = "gpio";
        };
 };
+
+&spi0 {
+       status = "disabled";
+};