ARM: dts: rockchip: remove broken-cd from emmc and sdio

Only one of "broken-cd" and "non-removable" should be supplied
according to Documentation/devicetree/bindings/mmc/mmc.txt.
Obviously emmc and sdio-wifi are non-removable devices, while
broken-cd is for removable device whose card detect pin is broken.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 01dd4a805c81165c5a81c9d2e9ca998773799bca..951f15d675c73b2c51225212ec5b2625756cd99a 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -345,7 +345,6 @@ &i2s {
 &sdio {
        status = "okay";
 
-       broken-cd;
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 8139fbf3de7ffb0dd5c2a937339dcfd950812577..fa6b5cf31aa7f6b73ff332bfb9e77ab2a8426a15 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -272,7 +272,6 @@ emmc: dwmmc@1021c000 {
                compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
                reg = <0x1021c000 0x4000>;
                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-               broken-cd;
                bus-width = <8>;
                cap-mmc-highspeed;
                clock-frequency = <37500000>;

diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 05533005a809cef3d40731a2f3b4d1477a531d26..3a5989b1724a8642d0e8514de454b96ae35bde2b 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -182,7 +182,6 @@ phy0: ethernet-phy@0 {
 };
 
 &emmc {
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        disable-wp;
@@ -348,7 +347,6 @@ &mmc0 {
 };
 
 &mmc1 {
-       broken-cd;
        bus-width = <4>;
        disable-wp;
        non-removable;

diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
index c75cc41d8c1f222e2aec766359e4b8f9afc7bd67..5956e8246abefe07c93fc3c93ee199619ffdfb34 100644 (file)
--- a/arch/arm/boot/dts/rk3228-evb.dts
+++ b/arch/arm/boot/dts/rk3228-evb.dts
@@ -53,7 +53,6 @@ memory {
 };
 
 &emmc {
-       broken-cd;
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
        disable-wp;

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 78d47f7d2938532d435954c731ba7e99063939c2..3ccd8f35a841992a78731cc225f8bc73cb55e60e 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -172,7 +172,6 @@ &cpu0 {
 };
 
 &emmc {
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        disable-wp;

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 98c586a43c73011f3aba567c784f573b8ab57dab..5f06d8c1b9f625103c51727ce1002306c901cbde 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -208,7 +208,6 @@ &cpu0 {
 };
 
 &emmc {
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        disable-wp;
@@ -509,7 +508,6 @@ &saradc {
 };
 
 &sdio0 {
-       broken-cd;
        bus-width = <4>;
        disable-wp;
        non-removable;

diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index 2ff9689d2e1b831c26f8e5660ee910ad2c18e6c6..eb77276e1cc2aaa95d46d3673f4f8431d803337b 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -162,7 +162,6 @@ &cpu0 {
 };
 
 &emmc {
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        disable-wp;

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 412809c60d01901087f67ed1107f2538ae3a8f1b..bfb20c8783849fce76663bdf40bca28c4059f76f 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -146,7 +146,6 @@ &cpu0 {
 &emmc {
        status = "okay";
 
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        rockchip,default-sample-phase = <158>;
@@ -347,7 +346,6 @@ &pwm1 {
 &sdio0 {
        status = "okay";
 
-       broken-cd;
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;