* [PATCH] arm: dts: rockchip: remove broken-cd from emmc and sdio
@ 2016-01-26 2:06 Shawn Lin
2016-01-26 2:23 ` Shawn Lin
2016-03-02 21:46 ` Heiko Stübner
0 siblings, 2 replies; 3+ messages in thread
From: Shawn Lin @ 2016-01-26 2:06 UTC (permalink / raw)
To: Heiko Stuebner
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Shawn Lin
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-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
---
arch/arm/boot/dts/rk3036-kylin.dts | 1 -
arch/arm/boot/dts/rk3036.dtsi | 1 -
arch/arm/boot/dts/rk3066a-rayeager.dts | 2 --
arch/arm/boot/dts/rk3228-evb.dts | 1 -
arch/arm/boot/dts/rk3288-evb.dtsi | 1 -
arch/arm/boot/dts/rk3288-firefly.dtsi | 2 --
arch/arm/boot/dts/rk3288-popmetal.dts | 1 -
arch/arm/boot/dts/rk3288-veyron.dtsi | 2 --
8 files changed, 11 deletions(-)
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 992f9ca..023153a 100644
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -262,7 +262,6 @@
&sdio {
status = "okay";
- broken-cd;
bus-width = <4>;
cap-sdio-irq;
default-sample-phase = <90>;
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index b9567c1..cf54066 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -214,7 +214,6 @@
compatible = "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 341c1f8..e9db017 100644
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -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;
diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
index e3898b8..a6d6a7b 100644
--- a/arch/arm/boot/dts/rk3228-evb.dts
+++ b/arch/arm/boot/dts/rk3228-evb.dts
@@ -53,7 +53,6 @@
};
&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 4faabdb..f90e408 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -172,7 +172,6 @@
};
&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 4e3fd9a..3f36af7 100644
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -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;
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index 65c4756..cc2be77 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -162,7 +162,6 @@
};
&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 9fce91f..725e08b 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -146,7 +146,6 @@
&emmc {
status = "okay";
- broken-cd;
bus-width = <8>;
cap-mmc-highspeed;
rockchip,default-sample-phase = <158>;
@@ -352,7 +351,6 @@
&sdio0 {
status = "okay";
- broken-cd;
bus-width = <4>;
cap-sd-highspeed;
cap-sdio-irq;
--
2.3.7
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm: dts: rockchip: remove broken-cd from emmc and sdio
2016-01-26 2:06 [PATCH] arm: dts: rockchip: remove broken-cd from emmc and sdio Shawn Lin
@ 2016-01-26 2:23 ` Shawn Lin
2016-03-02 21:46 ` Heiko Stübner
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Lin @ 2016-01-26 2:23 UTC (permalink / raw)
To: Heiko Stuebner
Cc: shawn.lin, linux-rockchip, linux-arm-kernel, linux-kernel,
devicetree, zhengxing, wxt
+ Xing and Caesar
Hi Xing and Caesar,
For future dts, we should avoid to add these two properties
together. :)
On 2016/1/26 10:06, Shawn Lin wrote:
> 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>
> ---
>
> arch/arm/boot/dts/rk3036-kylin.dts | 1 -
> arch/arm/boot/dts/rk3036.dtsi | 1 -
> arch/arm/boot/dts/rk3066a-rayeager.dts | 2 --
> arch/arm/boot/dts/rk3228-evb.dts | 1 -
> arch/arm/boot/dts/rk3288-evb.dtsi | 1 -
> arch/arm/boot/dts/rk3288-firefly.dtsi | 2 --
> arch/arm/boot/dts/rk3288-popmetal.dts | 1 -
> arch/arm/boot/dts/rk3288-veyron.dtsi | 2 --
> 8 files changed, 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
> index 992f9ca..023153a 100644
> --- a/arch/arm/boot/dts/rk3036-kylin.dts
> +++ b/arch/arm/boot/dts/rk3036-kylin.dts
> @@ -262,7 +262,6 @@
> &sdio {
> status = "okay";
>
> - broken-cd;
> bus-width = <4>;
> cap-sdio-irq;
> default-sample-phase = <90>;
> diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
> index b9567c1..cf54066 100644
> --- a/arch/arm/boot/dts/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rk3036.dtsi
> @@ -214,7 +214,6 @@
> compatible = "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 341c1f8..e9db017 100644
> --- a/arch/arm/boot/dts/rk3066a-rayeager.dts
> +++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
> @@ -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;
> diff --git a/arch/arm/boot/dts/rk3228-evb.dts b/arch/arm/boot/dts/rk3228-evb.dts
> index e3898b8..a6d6a7b 100644
> --- a/arch/arm/boot/dts/rk3228-evb.dts
> +++ b/arch/arm/boot/dts/rk3228-evb.dts
> @@ -53,7 +53,6 @@
> };
>
> &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 4faabdb..f90e408 100644
> --- a/arch/arm/boot/dts/rk3288-evb.dtsi
> +++ b/arch/arm/boot/dts/rk3288-evb.dtsi
> @@ -172,7 +172,6 @@
> };
>
> &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 4e3fd9a..3f36af7 100644
> --- a/arch/arm/boot/dts/rk3288-firefly.dtsi
> +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
> @@ -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;
> diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
> index 65c4756..cc2be77 100644
> --- a/arch/arm/boot/dts/rk3288-popmetal.dts
> +++ b/arch/arm/boot/dts/rk3288-popmetal.dts
> @@ -162,7 +162,6 @@
> };
>
> &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 9fce91f..725e08b 100644
> --- a/arch/arm/boot/dts/rk3288-veyron.dtsi
> +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
> @@ -146,7 +146,6 @@
> &emmc {
> status = "okay";
>
> - broken-cd;
> bus-width = <8>;
> cap-mmc-highspeed;
> rockchip,default-sample-phase = <158>;
> @@ -352,7 +351,6 @@
> &sdio0 {
> status = "okay";
>
> - broken-cd;
> bus-width = <4>;
> cap-sd-highspeed;
> cap-sdio-irq;
>
--
Best Regards
Shawn Lin
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm: dts: rockchip: remove broken-cd from emmc and sdio
2016-01-26 2:06 [PATCH] arm: dts: rockchip: remove broken-cd from emmc and sdio Shawn Lin
2016-01-26 2:23 ` Shawn Lin
@ 2016-03-02 21:46 ` Heiko Stübner
1 sibling, 0 replies; 3+ messages in thread
From: Heiko Stübner @ 2016-03-02 21:46 UTC (permalink / raw)
To: Shawn Lin; +Cc: linux-rockchip, linux-arm-kernel, linux-kernel, devicetree
Am Dienstag, 26. Januar 2016, 10:06:43 schrieb Shawn Lin:
> 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>
applied to my dts32 branch
Thanks
Heiko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-02 21:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-26 2:06 [PATCH] arm: dts: rockchip: remove broken-cd from emmc and sdio Shawn Lin
2016-01-26 2:23 ` Shawn Lin
2016-03-02 21:46 ` Heiko Stübner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).