4 files changed, 6 insertions, 24 deletions

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 2dd70e973859..ddaa61a38018 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -279,19 +279,12 @@
                 };
         };
 
-        spi_0: spi@12d20000 {
-                status = "disabled";
-        };
-
         spi_1: spi@12d30000 {
+                status = "okay";
                 samsung,spi-src-clk = <0>;
                 num-cs = <1>;
         };
 
-        spi_2: spi@12d40000 {
-                status = "disabled";
-        };
-
         hdmi {
                 hpd-gpio = <&gpx3 7 0>;
         };
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 6e30c391c11a..a1b88c959126 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -428,18 +428,6 @@
                 status = "okay";
         };
 
-        spi_0: spi@12d20000 {
-                status = "disabled";
-        };
-
-        spi_1: spi@12d30000 {
-                status = "disabled";
-        };
-
-        spi_2: spi@12d40000 {
-                status = "disabled";
-        };
-
         gpio_keys {
                 compatible = "gpio-keys";
 
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index f079c4ce3684..66be8270d186 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -184,6 +184,8 @@
         };
 
         spi_1: spi@12d30000 {
+                status = "okay";
+
                 w25q80bw@0 {
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -209,10 +211,6 @@
                 };
         };
 
-        spi_2: spi@12d40000 {
-                status = "disabled";
-        };
-
         hdmi {
                 hpd-gpio = <&gpx3 7 0>;
         };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 108739a3a93e..14c4f63d05da 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -351,6 +351,7 @@
 
         spi_0: spi@12d20000 {
                 compatible = "samsung,exynos4210-spi";
+                status = "disabled";
                 reg = <0x12d20000 0x100>;
                 interrupts = <0 66 0>;
                 dmas = <&pdma0 5
@@ -366,6 +367,7 @@
 
         spi_1: spi@12d30000 {
                 compatible = "samsung,exynos4210-spi";
+                status = "disabled";
                 reg = <0x12d30000 0x100>;
                 interrupts = <0 67 0>;
                 dmas = <&pdma1 5
@@ -381,6 +383,7 @@
 
         spi_2: spi@12d40000 {
                 compatible = "samsung,exynos4210-spi";
+                status = "disabled";
                 reg = <0x12d40000 0x100>;
                 interrupts = <0 68 0>;
                 dmas = <&pdma0 7