* [PATCH] arm64: dts: hikey960: Remove deprecated MMC properties
@ 2018-06-18 18:08 Ryan Grachek
2018-07-18 15:34 ` Wei Xu
0 siblings, 1 reply; 2+ messages in thread
From: Ryan Grachek @ 2018-06-18 18:08 UTC (permalink / raw)
Cc: john.stultz, Ryan Grachek, Wei Xu, Rob Herring, Mark Rutland,
Catalin Marinas, Will Deacon, linux-arm-kernel, devicetree,
linux-kernel
Signed-off-by: Ryan Grachek <ryan@edited.us>
---
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 1 -
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 --------
2 files changed, 9 deletions(-)
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index c706f70ce9f2..abc991619c75 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -611,7 +611,6 @@
broken-cd;
/* WL_EN */
vmmc-supply = <&wlan_en>;
- ti,non-removable;
non-removable;
cap-power-off-card;
keep-power-in-suspend;
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 484b837757f3..74c0509f99e9 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -1121,7 +1121,6 @@
bus-width = <0x4>;
disable-wp;
cap-sd-highspeed;
- supports-highspeed;
card-detect-delay = <200>;
reg = <0x0 0xff37f000 0x0 0x1000>;
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
@@ -1142,12 +1141,6 @@
sd-uhs-sdr50;
sd-uhs-sdr104;
status = "disabled";
-
- slot@0 {
- reg = <0x0>;
- bus-width = <4>;
- disable-wp;
- };
};
/* SDIO */
@@ -1162,7 +1155,6 @@
reset-names = "reset";
card-detect-delay = <200>;
cap-sd-highspeed;
- supports-highspeed;
keep-power-in-suspend;
pinctrl-names = "default";
pinctrl-0 = <&sdio_pmx_func
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] arm64: dts: hikey960: Remove deprecated MMC properties
2018-06-18 18:08 [PATCH] arm64: dts: hikey960: Remove deprecated MMC properties Ryan Grachek
@ 2018-07-18 15:34 ` Wei Xu
0 siblings, 0 replies; 2+ messages in thread
From: Wei Xu @ 2018-07-18 15:34 UTC (permalink / raw)
To: Ryan Grachek
Cc: Mark Rutland, devicetree, Catalin Marinas, Will Deacon,
linux-kernel, Rob Herring, john.stultz, linux-arm-kernel
Hi Ryan,
On 2018/6/18 19:08, Ryan Grachek wrote:
> Signed-off-by: Ryan Grachek <ryan@edited.us>
Thanks!
Applied to the hisilicon dt tree.
Best Regards,
Wei
> ---
> arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 1 -
> arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 --------
> 2 files changed, 9 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> index c706f70ce9f2..abc991619c75 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> @@ -611,7 +611,6 @@
> broken-cd;
> /* WL_EN */
> vmmc-supply = <&wlan_en>;
> - ti,non-removable;
> non-removable;
> cap-power-off-card;
> keep-power-in-suspend;
> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
> index 484b837757f3..74c0509f99e9 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
> +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
> @@ -1121,7 +1121,6 @@
> bus-width = <0x4>;
> disable-wp;
> cap-sd-highspeed;
> - supports-highspeed;
> card-detect-delay = <200>;
> reg = <0x0 0xff37f000 0x0 0x1000>;
> interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1142,12 +1141,6 @@
> sd-uhs-sdr50;
> sd-uhs-sdr104;
> status = "disabled";
> -
> - slot@0 {
> - reg = <0x0>;
> - bus-width = <4>;
> - disable-wp;
> - };
> };
>
> /* SDIO */
> @@ -1162,7 +1155,6 @@
> reset-names = "reset";
> card-detect-delay = <200>;
> cap-sd-highspeed;
> - supports-highspeed;
> keep-power-in-suspend;
> pinctrl-names = "default";
> pinctrl-0 = <&sdio_pmx_func
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-18 15:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-18 18:08 [PATCH] arm64: dts: hikey960: Remove deprecated MMC properties Ryan Grachek
2018-07-18 15:34 ` Wei Xu
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).