arm: dts: exynos: Remove outdated DW MMC properties in all Exynos dts

Upstream properties were added to device trees to follow current Linux
kernel. DW MMC driver was updated accordingly. Safely remove outdated
MMC properties. Details on removed properties are as follows:

* samsung,removable: replaced by non-removable
* samsung,bus-width: replaced by bus-width
* samsung,timing:
  - replaced by samsung,dw-mshc-ciu-div and samsung,dw-mshc-sdr-timing
    in dw_mmc nodes
  - removed from sdhci nodes (it's neither described in bindings, nor
    it's used in s5p_sdhci.c driver)
* fifoth_val: replaced by fifo-depth
* bus_hz: replaced by clock-frequency
* div: the fixed CIU clock divider value was moved to the chip data in
  exynos_dw_mmc.c driver

No functional change.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts
index a4915de2c49c5c9ea8eb7334dcc9d2937c38a7b0..40289c8c4aafd05c4f13059c6eff57be7ff3087b 100644 (file)
--- a/arch/arm/dts/exynos4210-origen.dts
+++ b/arch/arm/dts/exynos4210-origen.dts
@@ -25,9 +25,7 @@
 };
 
 &sdhci2 {
-       samsung,bus-width = <4>;
        bus-width = <4>;
-       samsung,timing = <1 2 3>;
        cd-gpios = <&gpk2 2 0>;
        status = "okay";
 };

diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210-trats.dts
index 4fbdf4730994739861af92fb07ab23940b612161..88e9c0ed2bb013df5896a8350042b55c40027a1c 100644 (file)
--- a/arch/arm/dts/exynos4210-trats.dts
+++ b/arch/arm/dts/exynos4210-trats.dts
@@ -240,17 +240,13 @@
 };
 
 &sdhci0 {
-       samsung,bus-width = <8>;
        bus-width = <8>;
-       samsung,timing = <1 3 3>;
        pwr-gpios = <&gpk0 2 0>;
        status = "okay";
 };
 
 &sdhci2 {
-       samsung,bus-width = <4>;
        bus-width = <4>;
-       samsung,timing = <1 2 3>;
        cd-gpios = <&gpx3 4 0>;
        status = "okay";
 };

diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts
index 1b3ac1fee15f2fe4fbcb1fef9bcae8fb9cc6f737..c87b92be609d9e92b1614f7228e1051efc70b7d0 100644 (file)
--- a/arch/arm/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/dts/exynos4210-universal_c210.dts
@@ -235,17 +235,13 @@
 };
 
 &sdhci0 {
-       samsung,bus-width = <8>;
        bus-width = <8>;
-       samsung,timing = <1 3 3>;
        pwr-gpios = <&gpk0 2 0>;
        status = "okay";
 };
 
 &sdhci2 {
-       samsung,bus-width = <4>;
        bus-width = <4>;
-       samsung,timing = <1 2 3>;
        cd-gpios = <&gpx3 4 0>;
        status = "okay";
 };

diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts
index a405b9708719487e7bf6b75ed44e29771212cf38..346e0f55c76851d522e0d5018af788de1e7f933f 100644 (file)
--- a/arch/arm/dts/exynos4412-odroid.dts
+++ b/arch/arm/dts/exynos4412-odroid.dts
@@ -234,27 +234,19 @@
 };
 
 &sdhci2 {
-       samsung,bus-width = <4>;
        bus-width = <4>;
-       samsung,timing = <1 2 3>;
        cd-inverted;
        cd-gpios = <&gpk2 2 0>;
        status = "okay";
 };
 
 &mshc_0 {
-       samsung,bus-width = <8>;
        bus-width = <8>;
-       samsung,timing = <2 1 0>;
        samsung,dw-mshc-ciu-div = <0>;
        samsung,dw-mshc-sdr-timing = <2 1>;
-       samsung,removable = <0>;
        non-removable;
-       fifoth_val = <0x203f0040>;
        fifo-depth = <0x80>;
        clock-frequency = <400000000>;
-       bus_hz = <400000000>;
-       div = <0x3>;
        index = <4>;
        status = "okay";
 };

diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts
index 30758ffa1ef981b159ec11e353f54b345cf6e801..2b71d328cd0ea8cc469480acdf321bfb9230c956 100644 (file)
--- a/arch/arm/dts/exynos4412-trats2.dts
+++ b/arch/arm/dts/exynos4412-trats2.dts
@@ -108,9 +108,7 @@
        };
 
        sdhci@12510000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                pwr-gpios = <&gpk0 4 0>;
                status = "disabled";
        };
@@ -432,33 +430,23 @@
 };
 
 &sdhci0 {
-       samsung,bus-width = <8>;
        bus-width = <8>;
-       samsung,timing = <1 3 3>;
        pwr-gpios = <&gpk0 4 0>;
        status = "disabled";
 };
 
 &sdhci2 {
-       samsung,bus-width = <4>;
        bus-width = <4>;
-       samsung,timing = <1 2 3>;
        cd-gpios = <&gpk2 2 0>;
        status = "okay";
 };
 
 &mshc_0 {
-       samsung,bus-width = <8>;
        bus-width = <8>;
-       samsung,timing = <2 1 0>;
        samsung,dw-mshc-ciu-div = <0>;
        samsung,dw-mshc-sdr-timing = <2 1>;
-       samsung,removable = <0>;
        non-removable;
-       fifoth_val = <0x203f0040>;
        clock-frequency = <400000000>;
-       bus_hz = <400000000>;
-       div = <0x3>;
        index = <4>;
        fifo-depth = <0x80>;
        status = "okay";

diff --git a/arch/arm/dts/exynos5250-arndale.dts b/arch/arm/dts/exynos5250-arndale.dts
index 7f84589c97a2026b63a0db1af3b2d040694dbefd..4c894f1712fa1a8c4621632c557d4e598405b2da 100644 (file)
--- a/arch/arm/dts/exynos5250-arndale.dts
+++ b/arch/arm/dts/exynos5250-arndale.dts
@@ -27,9 +27,7 @@
        };
 
        mmc@12200000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 3>;
        };
@@ -39,9 +37,7 @@
        };
 
        mmc@12220000 {
-               samsung,bus-width = <4>;
                bus-width = <4>;
-               samsung,timing = <1 2 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 2>;
        };

diff --git a/arch/arm/dts/exynos5250-smdk5250.dts b/arch/arm/dts/exynos5250-smdk5250.dts
index 882db2d1f6085a68ed51b4b80c9d34819fde36c9..f9f54cb63871fb347767bc9bcb3c847eb8389377 100644 (file)
--- a/arch/arm/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/dts/exynos5250-smdk5250.dts
@@ -145,12 +145,9 @@
        };
 
        mmc@12200000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 3>;
-               samsung,removable = <0>;
                non-removable;
        };
 
@@ -159,12 +156,9 @@
        };
 
        mmc@12220000 {
-               samsung,bus-width = <4>;
                bus-width = <4>;
-               samsung,timing = <1 2 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 2>;
-               samsung,removable = <1>;
        };
 
        mmc@12230000 {

diff --git a/arch/arm/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts
index bcf04d5c07c0c6102da470c926f5a4dc4b411a29..ab7b5212ba7c9ba804dba03d11e90eaaadcfc7cb 100644 (file)
--- a/arch/arm/dts/exynos5250-snow.dts
+++ b/arch/arm/dts/exynos5250-snow.dts
@@ -301,12 +301,9 @@
        };
 
        mmc@12200000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 3>;
-               samsung,removable = <0>;
                non-removable;
        };
 
@@ -315,12 +312,9 @@
        };
 
        mmc@12220000 {
-               samsung,bus-width = <4>;
                bus-width = <4>;
-               samsung,timing = <1 2 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 2>;
-               samsung,removable = <1>;
        };
 
        mmc@12230000 {

diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts
index 7270a546a7957c42d0aae5f1c277d138e890ea14..9c478837ba44c61499c26b514db821ea40c16db2 100644 (file)
--- a/arch/arm/dts/exynos5250-spring.dts
+++ b/arch/arm/dts/exynos5250-spring.dts
@@ -103,12 +103,9 @@
        };
 
        mmc@12200000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 3>;
-               samsung,removable = <0>;
                non-removable;
        };
 

diff --git a/arch/arm/dts/exynos5420-smdk5420.dts b/arch/arm/dts/exynos5420-smdk5420.dts
index 1f27baafebaf487e536fb08c62d92746d931f1e7..6ba1306e862ad4676ab30a1cce79538c475624c7 100644 (file)
--- a/arch/arm/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/dts/exynos5420-smdk5420.dts
@@ -106,12 +106,9 @@
        };
 
        mmc@12200000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 3>;
-               samsung,removable = <0>;
                non-removable;
                samsung,pre-init;
        };
@@ -121,12 +118,9 @@
        };
 
        mmc@12220000 {
-               samsung,bus-width = <4>;
                bus-width = <4>;
-               samsung,timing = <1 2 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 2>;
-               samsung,removable = <1>;
        };
 
        mmc@12230000 {

diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts b/arch/arm/dts/exynos5422-odroidxu3.dts
index 767b3e415d583c8e6b8e62c738723e773c773651..ef25cf774470f362e0bd7b1043164617845edc7a 100644 (file)
--- a/arch/arm/dts/exynos5422-odroidxu3.dts
+++ b/arch/arm/dts/exynos5422-odroidxu3.dts
@@ -280,12 +280,10 @@
        };
 
        mmc@12200000 {
-               fifoth_val = <0x201f0020>;
                fifo-depth = <0x40>;
        };
 
        mmc@12220000 {
-               fifoth_val = <0x201f0020>;
                fifo-depth = <0x40>;
        };
 

diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi
index fd74166c7e480274fbd131ef58777a25d518963d..5915ed69779137109288d7f1f248fa31bfd8bf54 100644 (file)
--- a/arch/arm/dts/exynos54xx.dtsi
+++ b/arch/arm/dts/exynos54xx.dtsi
@@ -119,12 +119,9 @@
        };
 
        mmc@12200000 {
-               samsung,bus-width = <8>;
                bus-width = <8>;
-               samsung,timing = <1 3 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 3>;
-               samsung,removable = <0>;
                non-removable;
                samsung,pre-init;
        };
@@ -134,12 +131,9 @@
        };
 
        mmc@12220000 {
-               samsung,bus-width = <4>;
                bus-width = <4>;
-               samsung,timing = <1 2 3>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <1 2>;
-               samsung,removable = <1>;
        };
 
        mmc@12230000 {