Skip to contentSkip to conversation

arm64: dts: hikey960: Define wl1837 power capabilities

PATCH Applied Ryan Grachek 5 participants 5 messages Jun 13, 2018 – Jun 28, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: hikey960: Define wl1837 power capabilities

These properties are required for compatibility with runtime PM. Without these properties, MMC host controller will not be aware of power capabilities. When the wlcore driver attempts to power on the device, it will erroneously fail with -EACCES. This fixes a regression found here: https://lkml.org/lkml/2018/6/12/930

---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +2 -0
index c6999624ed8a..68c5a6c819ae 100644
@@ -585,6 +585,8 @@
 	vmmc-supply = <&wlan_en>;
 	ti,non-removable;
 	non-removable;
+	cap-power-off-card;
+	keep-power-in-suspend;
 	#address-cells = <0x1>;
 	#size-cells = <0x0>;
 	status = "ok";
Signature · 1 line
2.11.0
Tested-by Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Ryan Grachek

These properties are required for compatibility with runtime PM. Without these properties, MMC host controller will not be aware of power capabilities. When the wlcore driver attempts to power on the device, it will erroneously fail with -EACCES. This fixes a regression found here: https://lkml.org/lkml/2018/6/12/930

Fixes 60f36637bbbd ("wlcore: sdio: allow pm to handle sdio power")

Wei Xu: This also fixes a functional regression with wifi on the HiKey960 board that was introduced in 4.18-rc with commit 60f36637bbbd ("wlcore: sdio: allow pm to handle sdio power").

Could you please be sure to queue this for the 4.18-rc too?

thanks
-john

#2 lore raw
Quoted 13 lines · John Stultz
Quoted 7 lines · Ryan Grachek

These properties are required for compatibility with runtime PM. Without these properties, MMC host controller will not be aware of power capabilities. When the wlcore driver attempts to power on the device, it will erroneously fail with -EACCES. This fixes a regression found here: https://lkml.org/lkml/2018/6/12/930

Fixes 60f36637bbbd ("wlcore: sdio: allow pm to handle sdio power")
Quoted 5 lines

Wei Xu: This also fixes a functional regression with wifi on the HiKey960 board that was introduced in 4.18-rc with commit 60f36637bbbd ("wlcore: sdio: allow pm to handle sdio power").

Could you please be sure to queue this for the 4.18-rc too?

CCing wireless folks as well.

Signature · 1 line
Kalle Valo
Tested-by on v1 1/1
#3 lore raw
In reply to Ryan Grachek
Quoted 6 lines · Ryan Grachek

These properties are required for compatibility with runtime PM. Without these properties, MMC host controller will not be aware of power capabilities. When the wlcore driver attempts to power on the device, it will erroneously fail with -EACCES. This fixes a regression found here: https://lkml.org/lkml/2018/6/12/930

Thanks! As mentioned in the above thread, this lets wlan0 come up properly, which otherwise doesn't come up and spits out:

[    8.466097] wl1271_sdio mmc1:0001:2: wl12xx_sdio_power_on: failed to get_sync(-13)
Quoted 19 lines
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +2 -0
index c6999624ed8a..68c5a6c819ae 100644
@@ -585,6 +585,8 @@
 	vmmc-supply = <&wlan_en>;
 	ti,non-removable;
 	non-removable;
+	cap-power-off-card;
+	keep-power-in-suspend;
 	#address-cells = <0x1>;
 	#size-cells = <0x0>;
 	status = "ok";
maintainer Applied
#4 lore raw
In reply to Ryan Grachek

Hi Ryan,

Quoted 8 lines · Ryan Grachek

These properties are required for compatibility with runtime PM. Without these properties, MMC host controller will not be aware of power capabilities. When the wlcore driver attempts to power on the device, it will erroneously fail with -EACCES. This fixes a regression found here: https://lkml.org/lkml/2018/6/12/930

---

Applied to hisilicon fix tree.
Thanks!

Best Regards,
Wei

Quoted 17 lines
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +2 -0
index c6999624ed8a..68c5a6c819ae 100644
@@ -585,6 +585,8 @@
 	vmmc-supply = <&wlan_en>;
 	ti,non-removable;
 	non-removable;
+	cap-power-off-card;
+	keep-power-in-suspend;
 	#address-cells = <0x1>;
 	#size-cells = <0x0>;
 	status = "ok";