From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 12 Mar 2018 13:57:49 +0000 (+0100)
Subject: Merge tag 'hisi-arm64-dt-for-4.17' of git://github.com/hisilicon/linux-hisi into... 
X-Git-Tag: v4.17-rc1~105^2~49
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=dce8efa0575c8d9b5f9f9ae41437200c6d3e0bf3;p=linux-2.6-block.git

Merge tag 'hisi-arm64-dt-for-4.17' of git://github.com/hisilicon/linux-hisi into next/dt

Pull "ARM64: DT: Hisilicon SoC DT updates for 4.17" from Wei Xu:

- Add XGE CPLD control support for hip07 SoC
- Disable the SMMU on hip06 and hip07 SoCs becuase of
  the hardware limitation
- Enable HS200 mode for the MMC controller on hi6220 hikey board
- Remove "cooling-{min|max}-level" this kind unused properties
  for hi6220 SoC
- Add watchdog node for hi6220 SoC
- Remove "CPU_NAP" idle state on hikey960 board since it is
  not stable and useless with the updated firmware

* tag 'hisi-arm64-dt-for-4.17' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: Hi3660: Remove 'CPU_NAP' idle state
  arm64: dts: hi6220: enable watchdog
  ARM64: dts: hi6220: Remove "cooling-{min|max}-level" for CPU nodes
  arm64: dts: hikey: Enable HS200 mode on eMMC
  arm64: dts: hisi: Disable hisilicon smmu node on hip06/hip07
  arm64: dts: hisi: add hns-dsaf cpld control for the hip07 SoC
---

dce8efa0575c8d9b5f9f9ae41437200c6d3e0bf3