aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-01-25 21:06:43 -0500
committerHeiko Stuebner <heiko@sntech.de>2016-03-26 19:54:13 -0400
commit57375d88fa3f6bf9351051529464c708f72adb1d (patch)
treeec9f1d9e7a0bf4aa9ee61bea5bce9c7f7d5d2a83
parent26f5e19dfb07de627112074721f254482f941dab (diff)
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>
-rw-r--r--arch/arm/boot/dts/rk3036-kylin.dts1
-rw-r--r--arch/arm/boot/dts/rk3036.dtsi1
-rw-r--r--arch/arm/boot/dts/rk3066a-rayeager.dts2
-rw-r--r--arch/arm/boot/dts/rk3228-evb.dts1
-rw-r--r--arch/arm/boot/dts/rk3288-evb.dtsi1
-rw-r--r--arch/arm/boot/dts/rk3288-firefly.dtsi2
-rw-r--r--arch/arm/boot/dts/rk3288-popmetal.dts1
-rw-r--r--arch/arm/boot/dts/rk3288-veyron.dtsi2
8 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 01dd4a805c81..951f15d675c7 100644
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -345,7 +345,6 @@
345&sdio { 345&sdio {
346 status = "okay"; 346 status = "okay";
347 347
348 broken-cd;
349 bus-width = <4>; 348 bus-width = <4>;
350 cap-sd-highspeed; 349 cap-sd-highspeed;
351 cap-sdio-irq; 350 cap-sdio-irq;
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 8139fbf3de7f..fa6b5cf31aa7 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -272,7 +272,6 @@
272 compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc"; 272 compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";
273 reg = <0x1021c000 0x4000>; 273 reg = <0x1021c000 0x4000>;
274 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; 274 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
275 broken-cd;
276 bus-width = <8>; 275 bus-width = <8>;
277 cap-mmc-highspeed; 276 cap-mmc-highspeed;
278 clock-frequency = <37500000>; 277 clock-frequency = <37500000>;
diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 05533005a809..3a5989b1724a 100644
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -182,7 +182,6 @@
182}; 182};
183 183
184&emmc { 184&emmc {
185 broken-cd;
186 bus-width = <8>; 185 bus-width = <8>;
187 cap-mmc-highspeed; 186 cap-mmc-highspeed;
188 disable-wp; 187 disable-wp;
@@ -348,7 +347,6 @@
348}; 347};
349 348
350&mmc1 { 349&mmc1 {
351 broken-cd;
352 bus-width = <4>; 350 bus-width = <4>;
353 disable-wp; 351 disable-wp;
354 non-removable; 352 non-removable;
diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
index c75cc41d8c1f..5956e8246abe 100644
--- a/arch/arm/boot/dts/rk3228-evb.dts
+++ b/arch/arm/boot/dts/rk3228-evb.dts
@@ -53,7 +53,6 @@
53}; 53};
54 54
55&emmc { 55&emmc {
56 broken-cd;
57 cap-mmc-highspeed; 56 cap-mmc-highspeed;
58 mmc-ddr-1_8v; 57 mmc-ddr-1_8v;
59 disable-wp; 58 disable-wp;
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 78d47f7d2938..3ccd8f35a841 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -172,7 +172,6 @@
172}; 172};
173 173
174&emmc { 174&emmc {
175 broken-cd;
176 bus-width = <8>; 175 bus-width = <8>;
177 cap-mmc-highspeed; 176 cap-mmc-highspeed;
178 disable-wp; 177 disable-wp;
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 98c586a43c73..5f06d8c1b9f6 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -208,7 +208,6 @@
208}; 208};
209 209
210&emmc { 210&emmc {
211 broken-cd;
212 bus-width = <8>; 211 bus-width = <8>;
213 cap-mmc-highspeed; 212 cap-mmc-highspeed;
214 disable-wp; 213 disable-wp;
@@ -509,7 +508,6 @@
509}; 508};
510 509
511&sdio0 { 510&sdio0 {
512 broken-cd;
513 bus-width = <4>; 511 bus-width = <4>;
514 disable-wp; 512 disable-wp;
515 non-removable; 513 non-removable;
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index 2ff9689d2e1b..eb77276e1cc2 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -162,7 +162,6 @@
162}; 162};
163 163
164&emmc { 164&emmc {
165 broken-cd;
166 bus-width = <8>; 165 bus-width = <8>;
167 cap-mmc-highspeed; 166 cap-mmc-highspeed;
168 disable-wp; 167 disable-wp;
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 412809c60d01..bfb20c878384 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -146,7 +146,6 @@
146&emmc { 146&emmc {
147 status = "okay"; 147 status = "okay";
148 148
149 broken-cd;
150 bus-width = <8>; 149 bus-width = <8>;
151 cap-mmc-highspeed; 150 cap-mmc-highspeed;
152 rockchip,default-sample-phase = <158>; 151 rockchip,default-sample-phase = <158>;
@@ -347,7 +346,6 @@
347&sdio0 { 346&sdio0 {
348 status = "okay"; 347 status = "okay";
349 348
350 broken-cd;
351 bus-width = <4>; 349 bus-width = <4>;
352 cap-sd-highspeed; 350 cap-sd-highspeed;
353 cap-sdio-irq; 351 cap-sdio-irq;