Merge tag 'hisi-arm64-defconfig-for-5.5' of git://github.com/hisilicon/linux-hisi...
authorOlof Johansson <olof@lixom.net>
Mon, 4 Nov 2019 00:56:43 +0000 (16:56 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 4 Nov 2019 00:56:44 +0000 (16:56 -0800)
commitae314d78b54fefe2e85a08a1d4e6e37f161b05e2
treefbe57dedb29a87292901b9a6f0b6083ac4d7914c
parentcbf6673d672f9a572f98acc02d82d23d036cdb1f
parent006ece996d2206082d281ba271b1ed17f1ee6422
Merge tag 'hisi-arm64-defconfig-for-5.5' of git://github.com/hisilicon/linux-hisi into arm/defconfig

ARM64: hisilicon: defconfig updates for 5.5

- enable ARM SMMUv3 PMU and hisi ZIP controller as module for
  Kunpeng920 SoC

* tag 'hisi-arm64-defconfig-for-5.5' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable SMMU v3 PMCG
  arm64: defconfig: Enable HiSilicon ZIP controller

Link: https://lore.kernel.org/r/5DB95B1E.8060607@hisilicon.com
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm64/configs/defconfig