diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-03 16:56:43 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-03 16:56:44 -0800 |
| commit | ae314d78b54fefe2e85a08a1d4e6e37f161b05e2 (patch) | |
| tree | fbe57dedb29a87292901b9a6f0b6083ac4d7914c | |
| parent | cbf6673d672f9a572f98acc02d82d23d036cdb1f (diff) | |
| parent | 006ece996d2206082d281ba271b1ed17f1ee6422 (diff) | |
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>
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index a1cbe2acd564..658691d051ed 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -806,6 +806,7 @@ CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PHY_UNIPHIER_USB2=y CONFIG_PHY_UNIPHIER_USB3=y CONFIG_PHY_TEGRA_XUSB=y +CONFIG_ARM_SMMU_V3_PMU=m CONFIG_FSL_IMX8_DDR_PMU=m CONFIG_HISI_PMU=y CONFIG_QCOM_L2_PMU=y @@ -853,6 +854,7 @@ CONFIG_NLS_ISO8859_1=y CONFIG_SECURITY=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_HISI_ZIP=m CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=32 CONFIG_PRINTK_TIME=y |