UPSTREAM: 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.

Change-Id: I4be26d4bc14faefa9ff81fcabada0a768419108f
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from git.kernel.org next/linux-next.git master commit
 57375d88fa)
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
This commit is contained in:
Shawn Lin
2016-01-26 10:06:43 +08:00
committed by Caesar Wang
parent 1ab6db780c
commit ee818387e5
7 changed files with 0 additions and 10 deletions

View File

@@ -345,7 +345,6 @@
&sdio {
status = "okay";
broken-cd;
bus-width = <4>;
cap-sd-highspeed;
cap-sdio-irq;

View File

@@ -271,7 +271,6 @@
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>;

View File

@@ -170,7 +170,6 @@
};
&emmc {
broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
disable-wp;
@@ -336,7 +335,6 @@
};
&mmc1 {
broken-cd;
bus-width = <4>;
disable-wp;
non-removable;

View File

@@ -161,7 +161,6 @@
};
&emmc {
broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
disable-wp;

View File

@@ -208,7 +208,6 @@
};
&emmc {
broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
disable-wp;
@@ -485,7 +484,6 @@
};
&sdio0 {
broken-cd;
bus-width = <4>;
disable-wp;
non-removable;

View File

@@ -162,7 +162,6 @@
};
&emmc {
broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
disable-wp;

View File

@@ -146,7 +146,6 @@
&emmc {
status = "okay";
broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
rockchip,default-sample-phase = <158>;
@@ -347,7 +346,6 @@
&sdio0 {
status = "okay";
broken-cd;
bus-width = <4>;
cap-sd-highspeed;
cap-sdio-irq;