3 files changed, 28 insertions, 104 deletions

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 042fe9b8ef0c..9a19691a51fe 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -48,114 +48,133 @@
                 compatible = "samsung,s3c2410-wdt";
                 reg = <0x10060000 0x100>;
                 interrupts = <0 43 0>;
+                status = "disabled";
         };
 
         rtc@10070000 {
                 compatible = "samsung,s3c6410-rtc";
                 reg = <0x10070000 0x100>;
                 interrupts = <0 44 0>, <0 45 0>;
+                status = "disabled";
         };
 
         keypad@100A0000 {
                 compatible = "samsung,s5pv210-keypad";
                 reg = <0x100A0000 0x100>;
                 interrupts = <0 109 0>;
+                status = "disabled";
         };
 
         sdhci@12510000 {
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12510000 0x100>;
                 interrupts = <0 73 0>;
+                status = "disabled";
         };
 
         sdhci@12520000 {
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12520000 0x100>;
                 interrupts = <0 74 0>;
+                status = "disabled";
         };
 
         sdhci@12530000 {
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12530000 0x100>;
                 interrupts = <0 75 0>;
+                status = "disabled";
         };
 
         sdhci@12540000 {
                 compatible = "samsung,exynos4210-sdhci";
                 reg = <0x12540000 0x100>;
                 interrupts = <0 76 0>;
+                status = "disabled";
         };
 
         serial@13800000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13800000 0x100>;
                 interrupts = <0 52 0>;
+                status = "disabled";
         };
 
         serial@13810000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13810000 0x100>;
                 interrupts = <0 53 0>;
+                status = "disabled";
         };
 
         serial@13820000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13820000 0x100>;
                 interrupts = <0 54 0>;
+                status = "disabled";
         };
 
         serial@13830000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13830000 0x100>;
                 interrupts = <0 55 0>;
+                status = "disabled";
         };
 
         i2c@13860000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13860000 0x100>;
                 interrupts = <0 58 0>;
+                status = "disabled";
         };
 
         i2c@13870000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13870000 0x100>;
                 interrupts = <0 59 0>;
+                status = "disabled";
         };
 
         i2c@13880000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13880000 0x100>;
                 interrupts = <0 60 0>;
+                status = "disabled";
         };
 
         i2c@13890000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x13890000 0x100>;
                 interrupts = <0 61 0>;
+                status = "disabled";
         };
 
         i2c@138A0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138A0000 0x100>;
                 interrupts = <0 62 0>;
+                status = "disabled";
         };
 
         i2c@138B0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138B0000 0x100>;
                 interrupts = <0 63 0>;
+                status = "disabled";
         };
 
         i2c@138C0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138C0000 0x100>;
                 interrupts = <0 64 0>;
+                status = "disabled";
         };
 
         i2c@138D0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x138D0000 0x100>;
                 interrupts = <0 65 0>;
+                status = "disabled";
         };
 
         spi_0: spi@13920000 {
@@ -166,6 +185,7 @@
                 rx-dma-channel = <&pdma0 6>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
+                status = "disabled";
         };
 
         spi_1: spi@13930000 {
@@ -176,6 +196,7 @@
                 rx-dma-channel = <&pdma1 6>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
+                status = "disabled";
         };
 
         spi_2: spi@13940000 {
@@ -186,6 +207,7 @@
                 rx-dma-channel = <&pdma0 8>; /* preliminary */
                 #address-cells = <1>;
                 #size-cells = <0>;
+                status = "disabled";
         };
 
         amba {
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 0c49caa09978..d1a1101fd96e 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -40,6 +40,7 @@
                         <&gpk2 4 2 3 3>,
                         <&gpk2 5 2 3 3>,
                         <&gpk2 6 2 3 3>;
+                status = "okay";
         };
 
         sdhci@12510000 {
@@ -53,6 +54,7 @@
                         <&gpk0 4 2 3 3>,
                         <&gpk0 5 2 3 3>,
                         <&gpk0 6 2 3 3>;
+                status = "okay";
         };
 
         gpio_keys {
@@ -90,60 +92,4 @@
                         linux,code = <139>;
                 };
         };
-
-        keypad@100A0000 {
-                status = "disabled";
-        };
-
-        sdhci@12520000 {
-                status = "disabled";
-        };
-
-        sdhci@12540000 {
-                status = "disabled";
-        };
-
-        i2c@13860000 {
-                status = "disabled";
-        };
-
-        i2c@13870000 {
-                status = "disabled";
-        };
-
-        i2c@13880000 {
-                status = "disabled";
-        };
-
-        i2c@13890000 {
-                status = "disabled";
-        };
-
-        i2c@138A0000 {
-                status = "disabled";
-        };
-
-        i2c@138B0000 {
-                status = "disabled";
-        };
-
-        i2c@138C0000 {
-                status = "disabled";
-        };
-
-        i2c@138D0000 {
-                status = "disabled";
-        };
-
-        spi_0: spi@13920000 {
-                status = "disabled";
-        };
-
-        spi_1: spi@13930000 {
-                status = "disabled";
-        };
-
-        spi_2: spi@13940000 {
-                status = "disabled";
-        };
 };
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 1beccc8f14ff..b87cca2fca74 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -40,6 +40,7 @@
                         <&gpk2 4 2 3 3>,
                         <&gpk2 5 2 3 3>,
                         <&gpk2 6 2 3 3>;
+                status = "okay";
         };
 
         keypad@100A0000 {
@@ -47,6 +48,7 @@
                 samsung,keypad-num-columns = <8>;
                 linux,keypad-no-autorepeat;
                 linux,keypad-wakeup;
+                status = "okay";
 
                 row-gpios = <&gpx2 0 3 3 0>,
                             <&gpx2 1 3 3 0>;
@@ -128,6 +130,7 @@
                 samsung,i2c-max-bus-freq = <20000>;
                 gpios = <&gpd1 0 2 3 0>,
                         <&gpd1 1 2 3 0>;
+                status = "okay";
 
                 eeprom@50 {
                         compatible = "samsung,24ad0xd1";
@@ -140,58 +143,11 @@
                 };
         };
 
-        sdhci@12510000 {
-                status = "disabled";
-        };
-
-        sdhci@12520000 {
-                status = "disabled";
-        };
-
-        sdhci@12540000 {
-                status = "disabled";
-        };
-
-        i2c@13870000 {
-                status = "disabled";
-        };
-
-        i2c@13880000 {
-                status = "disabled";
-        };
-
-        i2c@13890000 {
-                status = "disabled";
-        };
-
-        i2c@138A0000 {
-                status = "disabled";
-        };
-
-        i2c@138B0000 {
-                status = "disabled";
-        };
-
-        i2c@138C0000 {
-                status = "disabled";
-        };
-
-        i2c@138D0000 {
-                status = "disabled";
-        };
-
-        spi_0: spi@13920000 {
-                status = "disabled";
-        };
-
-        spi_1: spi@13930000 {
-                status = "disabled";
-        };
-
         spi_2: spi@13940000 {
                 gpios = <&gpc1 1 5 3 0>,
                         <&gpc1 3 5 3 0>,
                         <&gpc1 4 5 3 0>;
+                status = "okay";
 
                 w25x80@0 {
                         #address-cells = <1>;