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. Most of these are small changes
  adding the options for newly upstreamed drivers, or drivers needed for
  new board support. Nothing specifically sticks out this time"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (25 commits)
  ARM: multi_v7_defconfig: enable CONFIG_EFI
  ARM: multi_v7_defconfig: Build Atmel maXTouch driver as a module
  ARM: defconfig: update the Integrator defconfig
  ARM: keystone: defconfig: Fix USB configuration
  ARM: imx_v6_v7_defconfig: Select the wm8960 codec driver
  ARM: omap2plus_defconfig: switch to the IIO BMP085 driver
  ARM: mvebu_v5_defconfig: use MV88E6XXX
  ARM: davinci_all_defconfig: Enable some UBI modules
  ARM: davinci_all_defconfig: Enable AEMIF as a module
  ARM: multi_v7_defconfig: Enable SECCOMP
  ARM: exynos_defconfig: Enable SECCOMP
  ARM: imx_v6_v7_defconfig: Add CONFIG_MPL3115
  ARM: imx_v6_v7_defconfig: Enable GPU support
  ARM: s3c2410_defconfig: Remove CONFIG_IPV6_PRIVACY
  ARM: exynos_defconfig: Enable PM_DEBUG
  ARM: exynos_defconfig: Enable bus frequency scaling with devfreq
  ARM: imx_v6_v7_defconfig: enable more USB configurations
  ARM: davinci_all_defconfig: enable SMSC ethernet PHY
  ARM: davinci_all_defconfig: enable RTC driver as module
  ARM: multi_v7_defconfig: Enable ARM_IMX6Q_CPUFREQ
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index 5845910,1bc93dd..437d074
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -126,9 -126,11 +126,11 @@@ CONFIG_SMP=
  CONFIG_NR_CPUS=16
  CONFIG_HIGHPTE=y
  CONFIG_CMA=y
+ CONFIG_SECCOMP=y
  CONFIG_ARM_APPENDED_DTB=y
  CONFIG_ARM_ATAG_DTB_COMPAT=y
  CONFIG_KEXEC=y
+ CONFIG_EFI=y
  CONFIG_CPU_FREQ=y
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@@ -136,6 -138,7 +138,7 @@@ CONFIG_CPU_FREQ_GOV_POWERSAVE=
  CONFIG_CPU_FREQ_GOV_USERSPACE=m
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
  CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+ CONFIG_ARM_IMX6Q_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y
@@@ -220,6 -223,7 +223,7 @@@ CONFIG_SATA_AHCI=
  CONFIG_SATA_AHCI_PLATFORM=y
  CONFIG_AHCI_BRCM=y
  CONFIG_AHCI_ST=y
+ CONFIG_AHCI_IMX=y
  CONFIG_AHCI_SUNXI=y
  CONFIG_AHCI_TEGRA=y
  CONFIG_SATA_HIGHBANK=y
@@@ -277,7 -281,7 +281,7 @@@ CONFIG_MOUSE_PS2_ELANTECH=
  CONFIG_MOUSE_CYAPA=m
  CONFIG_MOUSE_ELAN_I2C=y
  CONFIG_INPUT_TOUCHSCREEN=y
- CONFIG_TOUCHSCREEN_ATMEL_MXT=y
+ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
  CONFIG_TOUCHSCREEN_MMS114=m
  CONFIG_TOUCHSCREEN_ST1232=m
  CONFIG_TOUCHSCREEN_STMPE=y
@@@ -499,6 -503,7 +503,7 @@@ CONFIG_MFD_TPS65910=
  CONFIG_REGULATOR_ACT8945A=y
  CONFIG_REGULATOR_AB8500=y
  CONFIG_REGULATOR_ACT8865=y
+ CONFIG_REGULATOR_ANATOP=y
  CONFIG_REGULATOR_AS3711=y
  CONFIG_REGULATOR_AS3722=y
  CONFIG_REGULATOR_AXP20X=m
@@@ -593,6 -598,7 +598,7 @@@ CONFIG_DRM_PANEL_SIMPLE=
  CONFIG_DRM_STI=m
  CONFIG_DRM_VC4=y
  CONFIG_FB_ARMCLCD=y
+ CONFIG_FB_EFI=y
  CONFIG_FB_WM8505=y
  CONFIG_FB_SH_MOBILE_LCDC=y
  CONFIG_FB_SIMPLE=y
@@@ -750,6 -756,7 +756,7 @@@ CONFIG_RTC_DRV_S35390A=
  CONFIG_RTC_DRV_RX8581=m
  CONFIG_RTC_DRV_EM3027=y
  CONFIG_RTC_DRV_DA9063=m
+ CONFIG_RTC_DRV_EFI=m
  CONFIG_RTC_DRV_DIGICOLOR=m
  CONFIG_RTC_DRV_S5M=m
  CONFIG_RTC_DRV_S3C=m
@@@ -781,7 -788,7 +788,7 @@@ CONFIG_MXS_DMA=
  CONFIG_DMA_BCM2835=y
  CONFIG_DMA_OMAP=y
  CONFIG_QCOM_BAM_DMA=y
 -CONFIG_XILINX_VDMA=y
 +CONFIG_XILINX_DMA=y
  CONFIG_DMA_SUN6I=y
  CONFIG_STAGING=y
  CONFIG_SENSORS_ISL29018=y
@@@ -867,6 -874,8 +874,8 @@@ CONFIG_NVMEM=
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_RASPBERRYPI_FIRMWARE=y
+ CONFIG_EFI_VARS=m
+ CONFIG_EFI_CAPSULE_LOADER=m
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_MSDOS_FS=y