Merge tag 'mvebu-defconfig64-4.8-1' of git://git.infradead.org/linux-mvebu into next...

mvebu defconfig64 for 4.8 (part 1)

- Enable the PCIe host controller found on the Armada 7K/8K SoCs

* tag 'mvebu-defconfig64-4.8-1' of git://git.infradead.org/linux-mvebu:
  arm64: configs: enable PCIe driver for Armada 7K/8K

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 7ef1d05..89712f7 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -36,6 +36,7 @@ config ARCH_EXYNOS
        select HAVE_S3C_RTC if RTC_CLASS
        select PINCTRL
        select PINCTRL_EXYNOS
+       select SOC_SAMSUNG
        help
          This enables support for ARMv8 based Samsung Exynos SoC family.
 
@@ -66,6 +67,8 @@ config ARCH_MEDIATEK
 
 config ARCH_MESON
        bool "Amlogic Platforms"
+       select PINCTRL
+       select PINCTRL_MESON
        help
          This enables support for the Amlogic S905 SoCs.
 
@@ -160,6 +163,8 @@ config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
        select ARCH_REQUIRE_GPIOLIB
        select COMMON_CLK_VERSATILE
+       select PM
+       select PM_GENERIC_DOMAINS
        select POWER_RESET_VEXPRESS
        select VEXPRESS_CONFIG
        help
@@ -168,6 +173,7 @@ config ARCH_VEXPRESS
 
 config ARCH_VULCAN
        bool "Broadcom Vulcan SOC Family"
+       select GPIOLIB
        help
          This enables support for Broadcom Vulcan SoC Family
 

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 2f6787c..bfa006e 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -121,6 +121,7 @@ CONFIG_TUN=y
 CONFIG_VIRTIO_NET=y
 CONFIG_AMD_XGBE=y
 CONFIG_NET_XGENE=y
+CONFIG_MACB=y
 CONFIG_E1000E=y
 CONFIG_IGB=y
 CONFIG_IGBVF=y
@@ -128,6 +129,8 @@ CONFIG_SKY2=y
 CONFIG_RAVB=y
 CONFIG_SMC91X=y
 CONFIG_SMSC911X=y
+CONFIG_STMMAC_ETH=m
+CONFIG_REALTEK_PHY=m
 CONFIG_MICREL_PHY=y
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
@@ -344,5 +347,5 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
+# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
 CONFIG_CRYPTO_CRC32_ARM64=y