Commit 57375d88 authored by Shawn Lin's avatar Shawn Lin Committed by Heiko Stuebner

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: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 26f5e19d
...@@ -345,7 +345,6 @@ &i2s { ...@@ -345,7 +345,6 @@ &i2s {
&sdio { &sdio {
status = "okay"; status = "okay";
broken-cd;
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;
cap-sdio-irq; cap-sdio-irq;
......
...@@ -272,7 +272,6 @@ emmc: dwmmc@1021c000 { ...@@ -272,7 +272,6 @@ emmc: dwmmc@1021c000 {
compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc"; compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x1021c000 0x4000>; reg = <0x1021c000 0x4000>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
broken-cd;
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
clock-frequency = <37500000>; clock-frequency = <37500000>;
......
...@@ -182,7 +182,6 @@ phy0: ethernet-phy@0 { ...@@ -182,7 +182,6 @@ phy0: ethernet-phy@0 {
}; };
&emmc { &emmc {
broken-cd;
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp; disable-wp;
...@@ -348,7 +347,6 @@ &mmc0 { ...@@ -348,7 +347,6 @@ &mmc0 {
}; };
&mmc1 { &mmc1 {
broken-cd;
bus-width = <4>; bus-width = <4>;
disable-wp; disable-wp;
non-removable; non-removable;
......
...@@ -53,7 +53,6 @@ memory { ...@@ -53,7 +53,6 @@ memory {
}; };
&emmc { &emmc {
broken-cd;
cap-mmc-highspeed; cap-mmc-highspeed;
mmc-ddr-1_8v; mmc-ddr-1_8v;
disable-wp; disable-wp;
......
...@@ -172,7 +172,6 @@ &cpu0 { ...@@ -172,7 +172,6 @@ &cpu0 {
}; };
&emmc { &emmc {
broken-cd;
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp; disable-wp;
......
...@@ -208,7 +208,6 @@ &cpu0 { ...@@ -208,7 +208,6 @@ &cpu0 {
}; };
&emmc { &emmc {
broken-cd;
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp; disable-wp;
...@@ -509,7 +508,6 @@ &saradc { ...@@ -509,7 +508,6 @@ &saradc {
}; };
&sdio0 { &sdio0 {
broken-cd;
bus-width = <4>; bus-width = <4>;
disable-wp; disable-wp;
non-removable; non-removable;
......
...@@ -162,7 +162,6 @@ &cpu0 { ...@@ -162,7 +162,6 @@ &cpu0 {
}; };
&emmc { &emmc {
broken-cd;
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
disable-wp; disable-wp;
......
...@@ -146,7 +146,6 @@ &cpu0 { ...@@ -146,7 +146,6 @@ &cpu0 {
&emmc { &emmc {
status = "okay"; status = "okay";
broken-cd;
bus-width = <8>; bus-width = <8>;
cap-mmc-highspeed; cap-mmc-highspeed;
rockchip,default-sample-phase = <158>; rockchip,default-sample-phase = <158>;
...@@ -347,7 +346,6 @@ &pwm1 { ...@@ -347,7 +346,6 @@ &pwm1 {
&sdio0 { &sdio0 {
status = "okay"; status = "okay";
broken-cd;
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;
cap-sdio-irq; cap-sdio-irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment