UPSTREAM: ARM: dts: rockchip: remove broken-cd from emmc and sdio
authorShawn Lin <shawn.lin@rock-chips.com>
Tue, 26 Jan 2016 02:06:43 +0000 (10:06 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 29 Jun 2016 07:02:07 +0000 (15:02 +0800)
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>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
v4.8-armsoc/dts32 commit 57375d88fa3f6bf9351051529464c708f72adb1d)

Change-Id: Ie8df62156fbc96c0c9e16d05389b2f230b261f0e
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
arch/arm/boot/dts/rk3228-evb.dts

index c75cc41d8c1f222e2aec766359e4b8f9afc7bd67..5956e8246abefe07c93fc3c93ee199619ffdfb34 100644 (file)
@@ -53,7 +53,6 @@
 };
 
 &emmc {
-       broken-cd;
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
        disable-wp;