From: Olof Johansson <olof@lixom.net>
Date: Wed, 19 Apr 2017 14:07:50 +0000 (-0700)
Subject: Merge tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu into... 
X-Git-Tag: v4.12-rc1~53^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98e53cfaf755309c66d840f95d5b39186629c44d;p=thirdparty%2Fkernel%2Flinux.git

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>
---

98e53cfaf755309c66d840f95d5b39186629c44d
diff --cc arch/arm64/configs/defconfig
index 56ae20067acf2,77eb1e448dc8d..701b0ee36cf3e
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -413,7 -401,7 +413,8 @@@ CONFIG_MMC_DW_EXYNOS=
  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
  CONFIG_LEDS_GPIO=y