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

Pull ARM SoC defconfig updates from Olof Johansson:
 "Defconfig additions, removals, etc.

  Most of these are small changes adding the options for newly
  upstreamed drivers, or drivers needed for new board support.

  - removed Broadcom bcm_defconfig, targets are all covered in
    multi_v7_defconfig

  - new defconfig: multi_v4t_defconfig"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
  ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
  ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
  ARM: configs: lpc18xx: enable adc and dac iio drivers
  ARM: config: Add a multi_v4t_defconfig
  ARM: multi_v7_defconfig: add ACT8945A
  ARM: at91/defconfig: Add ACT8945A driver
  ARM: imx_v6_v7_defconfig: Select ADS7846 support
  ARM: configs: qualcomm: Add MDM9615 missing defconfigs
  ARM: multi_v7_defconfig: Enable vivid driver as a module
  ARM: exynos_defconfig: Enable vivid driver as a module
  ARM: defconfig: enable the MSM8660 pin controller
  ARM: imx_v6_v7_defconfig: enable USB FFS gadget
  ARM: socfpga: enable PL330 DMA in socfpga_defconfig
  ARM: socfpga: add PCIe to socfpga_defconfig
  ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
  ARM: shmobile: defconfig: Enable r8a7792 SoC
  ARM: Remove bcm_defconfig
  ARM: multi_v7_defconfig: Enable Broadcom Kona watchdog
  ARM: multi_v7_defconfig: Enable Broadcom STB PWM
  ...

diff --cc arch/arm/configs/exynos_defconfig
index 47195e8690b4ed9c8b7c9937cb62ef7fb8ab795b,d1fd5a7f69064899b3d68eab1045224d09e43b76..01986deef7c5a7b10cf229f901cac91782360441
--- 1/arch/arm/configs/exynos_defconfig
--- 2/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -82,11 -79,10 +79,11 @@@ CONFIG_TOUCHSCREEN_MMS114=
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MAX77693_HAPTIC=y
  CONFIG_INPUT_MAX8997_HAPTIC=y
 +CONFIG_KEYBOARD_SAMSUNG=y
  CONFIG_SERIAL_8250=y
+ CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_SERIAL_SAMSUNG=y
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
- CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_HW_RANDOM=y
  CONFIG_TCG_TPM=y
  CONFIG_TCG_TIS_I2C_INFINEON=y

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm/mach-keystone/Kconfig
index bac577badc7e90b5511e7bfba874809d12f2fa98,929fe91cc82b730210371826cd0ec63fe73c5f4d..8ff61be1a29fb93f30f986d09ecbbcfdeca33a46
--- 1/arch/arm/mach-keystone/Kconfig
--- 2/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@@ -1,10 -1,9 +1,9 @@@
  config ARCH_KEYSTONE
        bool "Texas Instruments Keystone Devices"
        depends on ARCH_MULTI_V7
-       depends on ARM_PATCH_PHYS_VIRT
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
 -      select CLKSRC_MMIO
 +      select KEYSTONE_TIMER
        select ARM_ERRATA_798181 if SMP
        select COMMON_CLK_KEYSTONE
        select ARCH_SUPPORTS_BIG_ENDIAN