ARM: dts: exynos: Remove num-slots from exynos platforms

dwmmc driver deprecated num-slots and plan to get rid
of it finally. Just move a step to cleanup it from DT.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
index 4bd2ee87124eab05014568fdbc24d308611bdf16..4cbfa09c6c4e46fb25bfea03996aee13dcddc662 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts
+++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts
@@ -22,7 +22,6 @@
 };
 
 &mshc_2 {
-       num-slots = <1>;
        cap-sd-highspeed;
        disable-wp;
        vqmmc-supply = <&ldo3_reg>;

diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi
index 59c89d7662a8004b03f52cbdab7d3f9903bf9326..639c2e605f3c99a4c5478b85c4ac69c236f8bfba 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-artik5.dtsi
+++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi
@@ -304,7 +304,6 @@
 };
 
 &mshc_0 {
-       num-slots = <1>;
        non-removable;
        cap-mmc-highspeed;
        card-detect-delay = <200>;

diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
index accee81da266e3c1e9a3cb7e55998c658f1017a7..bbdfcbc6e7d29a5cdbb854ba030f1d77cae048ad 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -426,7 +426,6 @@
 &mshc_0 {
        #address-cells = <1>;
        #size-cells = <0>;
-       num-slots = <1>;
        broken-cd;
        non-removable;
        cap-mmc-highspeed;

diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index ec9bb850c86cc73231533da682b2b5583b3f3716..0b45467d77a8f53d5b21ce910cadfd2d1226565e 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -621,7 +621,6 @@
 &mshc_0 {
        #address-cells = <1>;
        #size-cells = <0>;
-       num-slots = <1>;
        broken-cd;
        non-removable;
        cap-mmc-highspeed;

diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
index 4cd62487bb16f28a2b1303ac4ce3486a552a7214..14ce2c69bc0b4972d4cb4817fcfaaca0b8b953d4 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
+++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
@@ -466,7 +466,6 @@
        pinctrl-names = "default";
        status = "okay";
        vmmc-supply = <&buck9_reg>;
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 219d587c5a85059f9bd44ac69a794cae25a21bf7..102acd78be15a9a972a2334cb520021424045ba0 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -516,7 +516,6 @@
        mmc-pwrseq = <&emmc_pwrseq>;
        status = "okay";
 
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 7a83e2df18a606a8247859647aa0fa5f7e172236..8a89eb893d644d46ad79d7f3e7161edb2d0eccf0 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -488,7 +488,6 @@
        pinctrl-names = "default";
        status = "okay";
 
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index d3ba97b05f81004cb6d6f795ab2db012095a0df0..bceb919ac6379ad8d5034913b32ecdfd436a7030 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -880,7 +880,6 @@
 };
 
 &mshc_0 {
-       num-slots = <1>;
        broken-cd;
        non-removable;
        card-detect-delay = <200>;

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 6a432460eb77b910d58c3d174ae22c03b7adbae4..18a7f396ac5f727b4daa0c15b2723b3ca89035d2 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -518,7 +518,6 @@
 
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
@@ -533,7 +532,6 @@
 
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <2 3>;

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 6632f657394e6d4ee44774573487a77c08acae5b..062cba4c2c310b28846634d354b10fe4d07e786c 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -346,7 +346,6 @@
 
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
@@ -360,7 +359,6 @@
 
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <2 3>;

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index e1d293dbbe5d95623ddd8b26a951c5e3360afb24..8788880e459d3e1dde6bfddbe80ae3c631693d89 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -530,7 +530,6 @@
 /* eMMC flash */
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        non-removable;
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <2 3>;
@@ -544,7 +543,6 @@
 /* uSD card */
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
        samsung,dw-mshc-sdr-timing = <2 3>;
@@ -564,7 +562,6 @@
  */
 &mmc_3 {
        status = "okay";
-       num-slots = <1>;
        non-removable;
        cap-sdio-irq;
        keep-power-in-suspend;

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 95c3bcace9dcbe8fcc233a17d88320f3ffd73fd6..d53bfcbeb39c42f3789514953f152413418d0d49 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -427,7 +427,6 @@
 
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;
@@ -445,7 +444,6 @@
  */
 &mmc_1 {
        status = "okay";
-       num-slots = <1>;
        broken-cd;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;

diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index d0cc300cfb4b6ae185677e9971e537f31f560559..73b7cdd5f5223cafaa99c7181d23586061f1b189 100644 (file)
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -67,7 +67,6 @@
 
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        broken-cd;
        bypass-smu;
        cap-mmc-highspeed;
@@ -83,7 +82,6 @@
 
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        cap-sd-highspeed;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;

diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts
index 6cc74d97daaea595d8b6d0ece1d10c773a71f720..9cb7726ef8d0dbc1f4bb6964acc64bc34abd566e 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-smdk5410.dts
+++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts
@@ -41,7 +41,6 @@
 
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        cap-mmc-highspeed;
        broken-cd;
        card-detect-delay = <200>;
@@ -53,7 +52,6 @@
 
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        cap-sd-highspeed;
        card-detect-delay = <200>;
        samsung,dw-mshc-ciu-div = <3>;

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index f9a75bfd3f2bfdc45575c5947f6107024d15e42a..683a4cfb4a23d469ba91670f414e27ea03d57f5a 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -699,7 +699,6 @@
 /* eMMC flash */
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        mmc-hs200-1_8v;
        cap-mmc-highspeed;
        non-removable;
@@ -717,7 +716,6 @@
 /* WiFi SDIO module */
 &mmc_1 {
        status = "okay";
-       num-slots = <1>;
        non-removable;
        cap-sdio-irq;
        keep-power-in-suspend;
@@ -737,7 +735,6 @@
 /* uSD card */
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        cap-sd-highspeed;
        card-detect-delay = <200>;
        clock-frequency = <400000000>;

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 953dc8677dc888d21f4207d27de2d8268d812198..b2b95ff205e81ba9248f3f29416001459e3c3d77 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -667,7 +667,6 @@
 /* eMMC flash */
 &mmc_0 {
        status = "okay";
-       num-slots = <1>;
        mmc-hs200-1_8v;
        mmc-hs400-1_8v;
        cap-mmc-highspeed;
@@ -686,7 +685,6 @@
 /* WiFi SDIO module */
 &mmc_1 {
        status = "okay";
-       num-slots = <1>;
        non-removable;
        cap-sdio-irq;
        keep-power-in-suspend;
@@ -706,7 +704,6 @@
 /* uSD card */
 &mmc_2 {
        status = "okay";
-       num-slots = <1>;
        cap-sd-highspeed;
        card-detect-delay = <200>;
        clock-frequency = <400000000>;