Merge tag 'hisi-fixes-for-4.18' of git://github.com/hisilicon/linux-hisi into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 29 Jun 2018 21:06:49 +0000 (14:06 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 29 Jun 2018 21:06:49 +0000 (14:06 -0700)
commit35911e01e5a374e3953b53d72e1a7e7c219f47a9
tree2b7762853bb9084a5aa5ec6f47d4ad8a48412275
parentd2d369a9618be01b1f59965b447bb49e7c4ec305
parenta30449eb3ac908f26b4bc963a58039a5f2725ffa
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: Olof Johansson <olof@lixom.net>