Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "Defconfig additions, removals, etc. Almost all of them just turn on
  drivers that we want on some platform, usually after the driver has
  been merged into mainline.

  There is now a new defconfig file for tango4"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
  ARM: multi_v7_defconfig: enable pstore configs
  ARM: multi_v7_defconfig: enable some newly added crypto modules
  ARM: davinci_all_defconfig: enable SATA modules
  arm64: defconfig: enable CONFIG_MTD_NAND and CONFIG_MTD_NAND_DENALI_DT
  arm64: defconfig: enable CONFIG_MTD_BLOCK
  ARM: Import tango4_defconfig
  ARM: omap2plus_defconfig: Enable support for RTC M41T80
  ARM: omap2plus_defconfig: Enable support for micrell phys
  ARM: vf610m4: defconfig: enable EXT4 filesystem
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  arm64: defconfig: Enable NUMA and NUMA_BALANCING
  arm64: defconfig: enable SMMUv3 config
  ARM: davinci_all_defconfig: enable iio
  ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
  ARM: configs: stm32: Add RTC support in STM32 defconfig
  ARM: defconfig: qcom: add APQ8060 DragonBoard devices
  ARM: qcom_defconfig: enable thermal sensors
  ARM: qcom_defconfig: add ahci configs
  ARM: qcom_defconfig: add pcie and atl1c ethernet configs
  ARM: qcom_defconfig: add usb related configs
  ...

diff --combined arch/arm/configs/aspeed_g4_defconfig
index 05b99bc1c1ce03e2adbb3cd9a2fbccb6b2ff3164,2ea82272c2cb0256364c01de7d1eb3e216b94f03..d25010e3a0bc6996e678e36aa788c526b834bbd0
--- 1/arch/arm/configs/aspeed_g4_defconfig
--- 2/arch/arm/configs/aspeed_g4_defconfig
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@@ -25,25 -25,53 +25,52 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_ARCH_MULTI_V7 is not set
  CONFIG_ARCH_ASPEED=y
  CONFIG_MACH_ASPEED_G4=y
 -CONFIG_DEBUG_RODATA=y
  CONFIG_AEABI=y
  CONFIG_UACCESS_WITH_MEMCPY=y
  CONFIG_SECCOMP=y
- # CONFIG_ATAGS is not set
- CONFIG_ZBOOT_ROM_TEXT=0x0
- CONFIG_ZBOOT_ROM_BSS=0x0
  CONFIG_ARM_APPENDED_DTB=y
  CONFIG_ARM_ATAG_DTB_COMPAT=y
  CONFIG_KEXEC=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+ CONFIG_NET=y
+ CONFIG_INET=y
+ CONFIG_NET_NCSI=y
+ # CONFIG_WIRELESS is not set
  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
+ CONFIG_NETDEVICES=y
+ # CONFIG_NET_VENDOR_ALACRITECH is not set
+ # CONFIG_NET_VENDOR_AMAZON is not set
+ # CONFIG_NET_VENDOR_ARC is not set
+ # CONFIG_NET_CADENCE is not set
+ # CONFIG_NET_VENDOR_BROADCOM is not set
+ # CONFIG_NET_VENDOR_CIRRUS is not set
+ # CONFIG_NET_VENDOR_EZCHIP is not set
+ CONFIG_FTGMAC100=y
+ # CONFIG_NET_VENDOR_HISILICON is not set
+ # CONFIG_NET_VENDOR_INTEL is not set
+ # CONFIG_NET_VENDOR_MARVELL is not set
+ # CONFIG_NET_VENDOR_MICREL is not set
+ # CONFIG_NET_VENDOR_NATSEMI is not set
+ # CONFIG_NET_VENDOR_NETRONOME is not set
+ # CONFIG_NET_VENDOR_QUALCOMM is not set
+ # CONFIG_NET_VENDOR_RENESAS is not set
+ # CONFIG_NET_VENDOR_ROCKER is not set
+ # CONFIG_NET_VENDOR_SAMSUNG is not set
+ # CONFIG_NET_VENDOR_SEEQ is not set
+ # CONFIG_NET_VENDOR_SOLARFLARE is not set
+ # CONFIG_NET_VENDOR_SMSC is not set
+ # CONFIG_NET_VENDOR_STMICRO is not set
+ # CONFIG_NET_VENDOR_SYNOPSYS is not set
+ # CONFIG_NET_VENDOR_VIA is not set
+ # CONFIG_NET_VENDOR_WIZNET is not set
+ # CONFIG_WLAN is not set
  # CONFIG_INPUT is not set
  # CONFIG_SERIO is not set
  # CONFIG_VT is not set
  # CONFIG_LEGACY_PTYS is not set
- # CONFIG_DEVKMEM is not set
  CONFIG_SERIAL_8250=y
  # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
  CONFIG_SERIAL_8250_CONSOLE=y
@@@ -52,7 -80,10 +79,10 @@@ CONFIG_SERIAL_8250_RUNTIME_UARTS=
  CONFIG_SERIAL_8250_EXTENDED=y
  CONFIG_SERIAL_8250_SHARE_IRQ=y
  CONFIG_SERIAL_OF_PLATFORM=y
+ CONFIG_ASPEED_BT_IPMI_BMC=y
  # CONFIG_HW_RANDOM is not set
+ CONFIG_GPIOLIB=y
+ CONFIG_GPIO_ASPEED=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_FIRMWARE_MEMMAP=y
@@@ -78,8 -109,7 +108,8 @@@ CONFIG_DEBUG_LL_UART_8250=
  CONFIG_DEBUG_UART_PHYS=0x1e784000
  CONFIG_DEBUG_UART_VIRT=0xe8784000
  CONFIG_EARLY_PRINTK=y
 -CONFIG_DEBUG_SET_MODULE_RONX=y
 +CONFIG_STRICT_MODULE_RWX=y
 +CONFIG_STRICT_KERNEL_RWX=y
  # CONFIG_XZ_DEC_X86 is not set
  # CONFIG_XZ_DEC_POWERPC is not set
  # CONFIG_XZ_DEC_IA64 is not set

diff --combined arch/arm/configs/aspeed_g5_defconfig
index 05a16d53d03c40570293a7dce2099c05ba706dcc,ae4295ec5c3e9994e085bb265a55ed05bb3248c3..5f660b02abd9024acce489bf2bc25798c975fcd8
--- 1/arch/arm/configs/aspeed_g5_defconfig
--- 2/arch/arm/configs/aspeed_g5_defconfig
+++ b/arch/arm/configs/aspeed_g5_defconfig
@@@ -26,6 -26,8 +26,7 @@@ CONFIG_ARCH_MULTI_V6=
  # CONFIG_ARCH_MULTI_V7 is not set
  CONFIG_ARCH_ASPEED=y
  CONFIG_MACH_ASPEED_G5=y
 -CONFIG_DEBUG_RODATA=y
+ CONFIG_VMSPLIT_2G=y
  CONFIG_AEABI=y
  CONFIG_UACCESS_WITH_MEMCPY=y
  CONFIG_SECCOMP=y
@@@ -36,15 -38,46 +37,46 @@@ CONFIG_ARM_APPENDED_DTB=
  CONFIG_ARM_ATAG_DTB_COMPAT=y
  CONFIG_KEXEC=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+ CONFIG_NET=y
+ CONFIG_UNIX=y
+ CONFIG_INET=y
+ CONFIG_NET_NCSI=y
+ # CONFIG_WIRELESS is not set
  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
+ CONFIG_NETDEVICES=y
+ # CONFIG_NET_VENDOR_ALACRITECH is not set
+ # CONFIG_NET_VENDOR_AMAZON is not set
+ # CONFIG_NET_VENDOR_ARC is not set
+ # CONFIG_NET_CADENCE is not set
+ # CONFIG_NET_VENDOR_BROADCOM is not set
+ # CONFIG_NET_VENDOR_CIRRUS is not set
+ # CONFIG_NET_VENDOR_EZCHIP is not set
+ CONFIG_FTGMAC100=y
+ # CONFIG_NET_VENDOR_HISILICON is not set
+ # CONFIG_NET_VENDOR_INTEL is not set
+ # CONFIG_NET_VENDOR_MARVELL is not set
+ # CONFIG_NET_VENDOR_MICREL is not set
+ # CONFIG_NET_VENDOR_NATSEMI is not set
+ # CONFIG_NET_VENDOR_NETRONOME is not set
+ # CONFIG_NET_VENDOR_QUALCOMM is not set
+ # CONFIG_NET_VENDOR_RENESAS is not set
+ # CONFIG_NET_VENDOR_ROCKER is not set
+ # CONFIG_NET_VENDOR_SAMSUNG is not set
+ # CONFIG_NET_VENDOR_SEEQ is not set
+ # CONFIG_NET_VENDOR_SOLARFLARE is not set
+ # CONFIG_NET_VENDOR_SMSC is not set
+ # CONFIG_NET_VENDOR_STMICRO is not set
+ # CONFIG_NET_VENDOR_SYNOPSYS is not set
+ # CONFIG_NET_VENDOR_VIA is not set
+ # CONFIG_NET_VENDOR_WIZNET is not set
+ # CONFIG_WLAN is not set
  # CONFIG_INPUT is not set
  # CONFIG_SERIO is not set
  # CONFIG_VT is not set
  # CONFIG_LEGACY_PTYS is not set
- # CONFIG_DEVKMEM is not set
  CONFIG_SERIAL_8250=y
  # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
  CONFIG_SERIAL_8250_CONSOLE=y
@@@ -53,7 -86,10 +85,10 @@@ CONFIG_SERIAL_8250_RUNTIME_UARTS=
  CONFIG_SERIAL_8250_EXTENDED=y
  CONFIG_SERIAL_8250_SHARE_IRQ=y
  CONFIG_SERIAL_OF_PLATFORM=y
+ CONFIG_ASPEED_BT_IPMI_BMC=y
  # CONFIG_HW_RANDOM is not set
+ CONFIG_GPIOLIB=y
+ CONFIG_GPIO_ASPEED=y
  # CONFIG_USB_SUPPORT is not set
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_FIRMWARE_MEMMAP=y
@@@ -80,8 -116,8 +115,9 @@@ CONFIG_DEBUG_LL_UART_8250=
  CONFIG_DEBUG_UART_PHYS=0x1e784000
  CONFIG_DEBUG_UART_VIRT=0xe8784000
  CONFIG_EARLY_PRINTK=y
 -CONFIG_DEBUG_SET_MODULE_RONX=y
 +CONFIG_STRICT_MODULE_RWX=y
 +CONFIG_STRICT_KERNEL_RWX=y
+ CONFIG_CRYPTO_ECHAINIV=y
  # CONFIG_XZ_DEC_X86 is not set
  # CONFIG_XZ_DEC_POWERPC is not set
  # CONFIG_XZ_DEC_IA64 is not set

diff --combined arch/arm/configs/exynos_defconfig
index 809f0bf3042ae4ed90f069e68defd3b590044461,12b8f69cbb529faede9f63dc2e064a33660a5e92..742baf067e1ca87a6251f21804dd6f88d23cfb69
--- 1/arch/arm/configs/exynos_defconfig
--- 2/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -24,7 -24,7 +24,7 @@@ CONFIG_ARM_APPENDED_DTB=
  CONFIG_ARM_ATAG_DTB_COMPAT=y
  CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
  CONFIG_CPU_FREQ=y
 -CONFIG_CPU_FREQ_STAT_DETAILS=y
 +CONFIG_CPU_FREQ_STAT=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_FREQ_GOV_POWERSAVE=m
  CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@@ -43,6 -43,7 +43,7 @@@ CONFIG_PACKET=
  CONFIG_UNIX=y
  CONFIG_NET_KEY=y
  CONFIG_INET=y
+ CONFIG_IP_MULTICAST=y
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
  CONFIG_IP_PNP_BOOTP=y

diff --combined arch/arm/configs/multi_v7_defconfig
index 78f7c91051ff7021ee47fea4a352574149d1173c,69bee6c5b3a3e95b6e18b4697a32a49e6b1ca1c2..a94126fb02c2af5b44dac0948febe57e3997c59a
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -87,6 -87,8 +87,8 @@@ CONFIG_ARCH_EMEV2=
  CONFIG_ARCH_R7S72100=y
  CONFIG_ARCH_R8A73A4=y
  CONFIG_ARCH_R8A7740=y
+ CONFIG_ARCH_R8A7743=y
+ CONFIG_ARCH_R8A7745=y
  CONFIG_ARCH_R8A7778=y
  CONFIG_ARCH_R8A7779=y
  CONFIG_ARCH_R8A7790=y
@@@ -132,7 -134,7 +134,7 @@@ CONFIG_ARM_ATAG_DTB_COMPAT=
  CONFIG_KEXEC=y
  CONFIG_EFI=y
  CONFIG_CPU_FREQ=y
 -CONFIG_CPU_FREQ_STAT_DETAILS=y
 +CONFIG_CPU_FREQ_STAT=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_FREQ_GOV_POWERSAVE=m
  CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@@ -253,8 -255,7 +255,8 @@@ CONFIG_R8169=
  CONFIG_SH_ETH=y
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=y
 -CONFIG_SYNOPSYS_DWC_ETH_QOS=y
 +CONFIG_STMMAC_PLATFORM=y
 +CONFIG_DWMAC_DWC_QOS_ETH=y
  CONFIG_TI_CPSW=y
  CONFIG_XILINX_EMACLITE=y
  CONFIG_AT803X_PHY=y
@@@ -297,7 -298,6 +299,6 @@@ CONFIG_TOUCHSCREEN_WM97XX=
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MAX77693_HAPTIC=m
  CONFIG_INPUT_MAX8997_HAPTIC=m
- CONFIG_INPUT_MPU3050=y
  CONFIG_INPUT_AXP20X_PEK=m
  CONFIG_INPUT_ADXL34X=m
  CONFIG_SERIO_AMBAKMI=y
@@@ -472,7 -472,7 +473,7 @@@ CONFIG_MESON_WATCHDOG=
  CONFIG_DW_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
 -CONFIG_BCM47XX_WATCHDOG=y
 +CONFIG_BCM47XX_WDT=y
  CONFIG_BCM7038_WDT=m
  CONFIG_BCM_KONA_WDT=y
  CONFIG_MFD_ACT8945A=y
@@@ -570,7 -570,6 +571,7 @@@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=
  CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
  CONFIG_VIDEO_STI_BDISP=m
  CONFIG_VIDEO_STI_HVA=m
 +CONFIG_VIDEO_STI_DELTA=m
  CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
  CONFIG_V4L_TEST_DRIVERS=y
@@@ -850,15 -849,18 +851,18 @@@ CONFIG_MEMORY=
  CONFIG_EXTCON=y
  CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
+ CONFIG_IIO_SW_TRIGGER=y
  CONFIG_AT91_ADC=m
  CONFIG_AT91_SAMA5D2_ADC=m
  CONFIG_BERLIN2_ADC=m
  CONFIG_EXYNOS_ADC=m
  CONFIG_VF610_ADC=m
  CONFIG_XILINX_XADC=y
+ CONFIG_MPU3050_I2C=y
  CONFIG_CM36651=m
  CONFIG_AK8975=y
  CONFIG_RASPBERRYPI_POWER=y
+ CONFIG_IIO_HRTIMER_TRIGGER=y
  CONFIG_PWM=y
  CONFIG_PWM_ATMEL=m
  CONFIG_PWM_ATMEL_HLCDC_PWM=m
@@@ -896,7 -898,7 +900,7 @@@ CONFIG_BCM2835_MBOX=
  CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_EFI_VARS=m
  CONFIG_EFI_CAPSULE_LOADER=m
 -CONFIG_CONFIG_BCM47XX_NVRAM=y
 +CONFIG_BCM47XX_NVRAM=y
  CONFIG_BCM47XX_SPROM=y
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
@@@ -909,6 -911,10 +913,10 @@@ CONFIG_TMPFS=
  CONFIG_SQUASHFS=y
  CONFIG_SQUASHFS_LZO=y
  CONFIG_SQUASHFS_XZ=y
+ CONFIG_PSTORE=y
+ CONFIG_PSTORE_CONSOLE=y
+ CONFIG_PSTORE_PMSG=y
+ CONFIG_PSTORE_RAM=y
  CONFIG_NFS_FS=y
  CONFIG_NFS_V3_ACL=y
  CONFIG_NFS_V4=y
@@@ -939,6 -945,9 +947,9 @@@ CONFIG_CRYPTO_SHA512_ARM=
  CONFIG_CRYPTO_AES_ARM=m
  CONFIG_CRYPTO_AES_ARM_BS=m
  CONFIG_CRYPTO_AES_ARM_CE=m
+ CONFIG_CRYPTO_CHACHA20_NEON=m
+ CONFIG_CRYPTO_CRC32_ARM_CE=m
+ CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
  CONFIG_CRYPTO_GHASH_ARM_CE=m
  CONFIG_CRYPTO_DEV_ATMEL_AES=m
  CONFIG_CRYPTO_DEV_ATMEL_TDES=m

diff --combined arch/arm/configs/pxa_defconfig
index 271dc7e78e439a2da4c2c1718521cae7a8904259,ce4660c79c7ac5ec6298b7d1f33a78c7854ea72f..2aac99fd1c41d264ed45c4a4a7fd68c5236ab9b8
--- 1/arch/arm/configs/pxa_defconfig
--- 2/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@@ -97,7 -97,7 +97,7 @@@ CONFIG_ZBOOT_ROM_BSS=0x
  CONFIG_CMDLINE="root=/dev/ram0 ro"
  CONFIG_KEXEC=y
  CONFIG_CPU_FREQ=y
 -CONFIG_CPU_FREQ_STAT_DETAILS=y
 +CONFIG_CPU_FREQ_STAT=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_FREQ_GOV_POWERSAVE=m
  CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@@ -334,7 -334,6 +334,6 @@@ CONFIG_TOUCHSCREEN_TOUCHIT213=
  CONFIG_TOUCHSCREEN_PCAP=m
  CONFIG_TOUCHSCREEN_ST1232=m
  CONFIG_INPUT_MISC=y
- CONFIG_INPUT_MPU3050=m
  CONFIG_INPUT_AXP20X_PEK=m
  CONFIG_INPUT_UINPUT=m
  CONFIG_INPUT_GPIO_ROTARY_ENCODER=m

diff --combined arch/arm/configs/shmobile_defconfig
index adeaecd831a4d0ad8551918804f7760fd7e714f3,760688aa5c79278a4a1713ada9e35681a6e51efb..3c66a422fb4df5678ac362a1c944a070403697d2
--- 1/arch/arm/configs/shmobile_defconfig
--- 2/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@@ -14,6 -14,8 +14,8 @@@ CONFIG_ARCH_EMEV2=
  CONFIG_ARCH_R7S72100=y
  CONFIG_ARCH_R8A73A4=y
  CONFIG_ARCH_R8A7740=y
+ CONFIG_ARCH_R8A7743=y
+ CONFIG_ARCH_R8A7745=y
  CONFIG_ARCH_R8A7778=y
  CONFIG_ARCH_R8A7779=y
  CONFIG_ARCH_R8A7790=y
@@@ -33,12 -35,13 +35,13 @@@ CONFIG_HAVE_ARM_ARCH_TIMER=
  CONFIG_NR_CPUS=8
  CONFIG_AEABI=y
  CONFIG_HIGHMEM=y
+ CONFIG_CMA=y
  CONFIG_ZBOOT_ROM_TEXT=0x0
  CONFIG_ZBOOT_ROM_BSS=0x0
  CONFIG_ARM_APPENDED_DTB=y
  CONFIG_KEXEC=y
  CONFIG_CPU_FREQ=y
 -CONFIG_CPU_FREQ_STAT_DETAILS=y
 +CONFIG_CPU_FREQ_STAT=y
  CONFIG_CPU_FREQ_GOV_POWERSAVE=y
  CONFIG_CPU_FREQ_GOV_USERSPACE=y
  CONFIG_CPU_FREQ_GOV_ONDEMAND=y
@@@ -58,6 -61,8 +61,8 @@@ CONFIG_CAN_RCAR=
  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
+ CONFIG_DMA_CMA=y
+ CONFIG_CMA_SIZE_MBYTES=64
  CONFIG_SIMPLE_PM_BUS=y
  CONFIG_MTD=y
  CONFIG_MTD_BLOCK=y
@@@ -145,6 -150,7 +150,7 @@@ CONFIG_VIDEO_RENESAS_JPU=
  CONFIG_VIDEO_RENESAS_VSP1=y
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=y
+ CONFIG_VIDEO_ADV7604=y
  CONFIG_VIDEO_ML86V7667=y
  CONFIG_DRM=y
  CONFIG_DRM_I2C_ADV7511=y

diff --combined arch/arm64/configs/defconfig
index 8752f578417c58f25ec943dfd6634a8e5af31740,35c0c97afe3a5c26ad19409477558e2850466fee..7c48028ec64a09e25a1b9dee9d907e577ebf712d
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -11,6 -11,7 +11,7 @@@ CONFIG_TASK_XACCT=
  CONFIG_TASK_IO_ACCOUNTING=y
  CONFIG_IKCONFIG=y
  CONFIG_IKCONFIG_PROC=y
+ CONFIG_NUMA_BALANCING=y
  CONFIG_MEMCG=y
  CONFIG_MEMCG_SWAP=y
  CONFIG_BLK_CGROUP=y
@@@ -53,7 -54,6 +54,7 @@@ CONFIG_ARCH_STRATIX10=
  CONFIG_ARCH_TEGRA=y
  CONFIG_ARCH_SPRD=y
  CONFIG_ARCH_THUNDER=y
 +CONFIG_ARCH_THUNDER2=y
  CONFIG_ARCH_UNIPHIER=y
  CONFIG_ARCH_VEXPRESS=y
  CONFIG_ARCH_VULCAN=y
@@@ -73,6 -73,7 +74,7 @@@ CONFIG_PCIE_QCOM=
  CONFIG_PCIE_ARMADA_8K=y
  CONFIG_ARM64_VA_BITS_48=y
  CONFIG_SCHED_MC=y
+ CONFIG_NUMA=y
  CONFIG_PREEMPT=y
  CONFIG_KSM=y
  CONFIG_TRANSPARENT_HUGEPAGE=y
@@@ -144,7 -145,10 +146,10 @@@ CONFIG_DEVTMPFS=
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_DMA_CMA=y
  CONFIG_MTD=y
+ CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
+ CONFIG_MTD_NAND=y
+ CONFIG_MTD_NAND_DENALI_DT=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
@@@ -383,7 -387,6 +388,7 @@@ CONFIG_MMC_SDHCI_ACPI=
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_OF_ARASAN=y
  CONFIG_MMC_SDHCI_OF_ESDHC=y
 +CONFIG_MMC_SDHCI_CADENCE=y
  CONFIG_MMC_SDHCI_TEGRA=y
  CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_SPI=y
@@@ -412,7 -415,6 +417,7 @@@ CONFIG_RTC_DRV_TEGRA=
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_RTC_DRV_S3C=y
  CONFIG_DMADEVICES=y
 +CONFIG_MV_XOR_V2=y
  CONFIG_PL330_DMA=y
  CONFIG_DMA_BCM2835=m
  CONFIG_TEGRA20_APB_DMA=y
@@@ -444,6 -446,7 +449,7 @@@ CONFIG_PLATFORM_MHU=
  CONFIG_BCM2835_MBOX=y
  CONFIG_HI6220_MBOX=y
  CONFIG_ARM_SMMU=y
+ CONFIG_ARM_SMMU_V3=y
  CONFIG_RASPBERRYPI_POWER=y
  CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD=y
@@@ -519,3 -522,4 +525,3 @@@ CONFIG_CRYPTO_GHASH_ARM64_CE=
  CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
  # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
 -CONFIG_CRYPTO_CRC32_ARM64=y