summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authoroscardagrach2018-06-13 20:03:21 +0200
committerWei Xu2018-06-28 18:07:44 +0200
commita30449eb3ac908f26b4bc963a58039a5f2725ffa (patch)
tree5f5a405e1848f65986b53f1f63effb9163681057 /arch/arm64
parentarm64: dts: hikey: Define wl1835 power capabilities (diff)
downloadkernel-qcow2-linux-a30449eb3ac908f26b4bc963a58039a5f2725ffa.tar.gz
kernel-qcow2-linux-a30449eb3ac908f26b4bc963a58039a5f2725ffa.tar.xz
kernel-qcow2-linux-a30449eb3ac908f26b4bc963a58039a5f2725ffa.zip
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 Fixes: 60f36637bbbd ("wlcore: sdio: allow pm to handle sdio power") Signed-off-by: Ryan Grachek <ryan@edited.us> Tested-by: John Stultz <john.stultz@linaro.org> Acked-by: John Stultz <john.stultz@linaro.org> Tested-by: Valentin Schneider <valentin.schneider@arm.com> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index c6999624ed8a..68c5a6c819ae 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -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";