From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Aug 2017 16:06:32 +0000 (+0200)
Subject: Merge tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi into... 
X-Git-Tag: v4.14-rc1~68^2~1^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4d3ae0d17336b8e7e2e1416ef036a7cb1b8af449;p=linux.git

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

Pull "ARM64: hisilicon: defconfig updates for 4.14" from Wei Xu:

- Enable Kirin PCIe host, hi6421v530 mfd and regulator,
  syscon reboot mode, serdev bus, OP-TEE and K3 DMA support
  for hikey and hikey960

- Enable pcie based sas controller support for hip08 SoC

* tag 'hisi-defconfig-for-4.14' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: enable DMA driver for hi3660
  arm64: defconfig: enable OP-TEE
  arm64: defconfig: enable support for serial port connected device
  arm64: defconfig: enable CONFIG_SYSCON_REBOOT_MODE
  arm64: defconfig: enable support hi6421v530 PMIC
  arm64: defconfig: enable Kirin PCIe
  arm64: defconfig: enable SCSI_HISI_SAS_PCI
---

4d3ae0d17336b8e7e2e1416ef036a7cb1b8af449