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

Pull ARM SoC defconfig updates from Olof Johansson:
 "Defconfig updates are kept separate from other branches mostly to
  avoid conflicts between the different categories (driver branch
  enabling something that has context conflict with SoC options, etc).

  A lot of this again is scattered across the various hardware
  platforms.  multi_v7_defconfig, our "generic" config for most 32-bit
  platforms has been gone through by Marvell Berlin maintainers and
  added most options they need to run on their hardware.  Broadcom NSP
  is also added there, and the new Atmel SAMA5D2 (added last release).
  Rockchip also has display and other devices supported in that config.

  In addition to that, the usual small churn of new options being added
  here and there"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
  ARM: multi_v7_defconfig: enable UniPhier I2C drivers
  ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in
  ARM: exynos_defconfig: Disable simplefb support
  ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
  ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable USB Video Class support
  ARM: multi_v7_defconfig: improve multi_v7_defconfig support for Berlin
  ARM: tegra: Update multi_v7_defconfig
  ARM: multi_v7_defconfig: Add Atmel SDHCI device
  ARM: multi_v7_defconfig: Add Atmel Flexcom device
  ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
  ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
  ARM: at91/defconfig: update at91_dt defconfig
  ARM: at91/defconfig: update sama5 defconfig
  ARM: configs: Enable FIXED_PHY in multi_v7 defconfig
  ARM: configs: update lpc18xx defconfig
  ARM: socfpga_defconfig: enable fpga manager
  ...

diff --cc arch/arm/configs/exynos_defconfig
index 0ff608fd7f0fadebad79209f88aac97a91069279,7172e96af22e20fc0d59b8f4cf79da8e3b42008e..e0841a58ff9d9e9fc399824ea85e5850daac60a3
--- 1/arch/arm/configs/exynos_defconfig
--- 2/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -167,7 -172,14 +173,13 @@@ CONFIG_MMC_SDHCI=
  CONFIG_MMC_SDHCI_S3C=y
  CONFIG_MMC_SDHCI_S3C_DMA=y
  CONFIG_MMC_DW=y
 -CONFIG_MMC_DW_IDMAC=y
  CONFIG_MMC_DW_EXYNOS=y
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
+ CONFIG_LEDS_GPIO=y
+ CONFIG_LEDS_PWM=y
+ CONFIG_LEDS_TRIGGERS=y
+ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_MAX77802=y

diff --cc arch/arm/configs/lpc18xx_defconfig
index b7e8cdab51f97ab4689a46fee6f8ad82a827bf7d,b758a808d31061be6d3998213466e4a7715124b3..03c155f5b811529abc46c71bc2989ddf00f10f6a
--- 1/arch/arm/configs/lpc18xx_defconfig
--- 2/arch/arm/configs/lpc18xx_defconfig
+++ b/arch/arm/configs/lpc18xx_defconfig
@@@ -117,8 -127,11 +127,10 @@@ CONFIG_FB_ARMCLCD=
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_ROOT_HUB_TT=y
+ CONFIG_USB_EHCI_HCD_PLATFORM=y
+ CONFIG_USB_STORAGE=y
  CONFIG_MMC=y
  CONFIG_MMC_DW=y
 -CONFIG_MMC_DW_IDMAC=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_PCA9532=y

diff --cc arch/arm64/configs/defconfig
Simple merge