aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-04-19 07:07:50 -0700
committerOlof Johansson <olof@lixom.net>2017-04-19 07:07:50 -0700
commit98e53cfaf755309c66d840f95d5b39186629c44d (patch)
tree5d8750345b369b08c114e008381823c80116270d
parentMerge tag 'samsung-soc64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/arm64 (diff)
parentarm64: defconfig: enable the Safexcel crypto engine as a module (diff)
downloadlinux-dev-98e53cfaf755309c66d840f95d5b39186629c44d.tar.xz
linux-dev-98e53cfaf755309c66d840f95d5b39186629c44d.zip
Merge tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu into next/arm64
mvebu defconfig64 for 4.12 (part 2) Select two new drivers for ARM64 mvebu SoCs: - Xenon SDHCI controller on Armada 37xx and Armada 7K/8K - Safexcel crypto engine on Armada 7K/8K * tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu: arm64: defconfig: enable the Safexcel crypto engine as a module arm64: configs: enable SDHCI driver for Xenon Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 56ae20067acf..701b0ee36cf3 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -413,6 +413,7 @@ CONFIG_MMC_DW_EXYNOS=y
CONFIG_MMC_DW_K3=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SUNXI=y
+CONFIG_MMC_SDHCI_XENON=y
CONFIG_MMC_BCM2835=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
@@ -537,6 +538,7 @@ CONFIG_MEMTEST=y
CONFIG_SECURITY=y
CONFIG_CRYPTO_ECHAINIV=y
CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
CONFIG_ARM64_CRYPTO=y
CONFIG_CRYPTO_SHA1_ARM64_CE=y
CONFIG_CRYPTO_SHA2_ARM64_CE=y