Merge branch 'hikey970-v4.9' of https://github.com/fengbaopeng/linux into fengbaopeng-hikey970-v4.9

* 'hikey970-v4.9' of https://github.com/fengbaopeng/linux:
  arm64: dts: kirin970: add ION dts entries and enable ION and IOMMU feature.
  mmc: dw_mmc-k3: add sd support for Hikey970
This commit is contained in:
Guodong Xu
2018-02-12 16:03:01 +08:00
5 changed files with 77 additions and 35 deletions
@@ -12,6 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller.
Required Properties:
* compatible: should be one of the following.
- "hisilicon,hi3670-dw-mshc": for controllers with hi3670 specific extensions.
- "hisilicon,hi3660-dw-mshc": for controllers with hi3660 specific extensions.
- "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions.
- "hisilicon,hi6220-dw-mshc": for controllers with hi6220 specific extensions.