Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35911e01 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-fixes-for-4.18' of git://github.com/hisilicon/linux-hisi into fixes 

ARM64: hisi fixes for 4.18

- Added power capabilities for the mmc host controller on the
  hikey and hikey960 boards to avoid broken wifi.

* tag 'hisi-fixes-for-4.18' of git://github.com/hisilicon/linux-hisi

:
  arm64: dts: hikey960: Define wl1837 power capabilities
  arm64: dts: hikey: Define wl1835 power capabilities

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d2d369a9 a30449eb

arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

+2 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

+2 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ 
		dwmmc_2: dwmmc2@f723f000 {

			bus-width = <0x4>;

			non-removable;

			cap-power-off-card;

			keep-power-in-suspend;

			vmmc-supply = <&reg_vdd_3v3>;

			mmc-pwrseq = <&wl1835_pwrseq>;