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

Pull ARM: SoC defconfig updates from Olof Johansson:
 "We've traditionally kept defconfig updates in a separate branch, often
  to encourage submaintainers to handle those patches separately to
  avoid conflicts on the shared files. The amount of changes seem to be
  decreasing though, so we might rethink how we handle this going
  forward.

  There really isn't much to write about here. The bulk of changes here
  are enabling drivers for whatever platforms the hardware is found on
  (and multi-configs)"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
  multi_v7_defconfig: make Rockchip usb2-phy built-in
  ARM: omap2plus_defconfig: Enable droid 4 devices
  ARM: omap2plus_defconfig: Add QMI, ACM and PPP as loadable modules
  ARM: configs: aspeed: Add new drivers
  ARM: configs: aspeed: Update configs for BMC systems
  ARM: omap2plus_defconfig: Enable TI Ethernet PHY
  ARM: configs: Add new config fragment to change RAM start point
  ARM: configs: stm32: Add I2C support
  multi_v7_defconfig: make Rockchip DRM drivers built-in
  ARM: configs: stm32: Set CPU_V7M_NUM_IRQ to max value
  ARM: imx_v6_v7_defconfig: Select SMSC_PHY
  ARM: davinci_all_defconfig: convert to use libata PATA
  ARM: qcom_defconfig: Enable Qualcomm remoteproc and related drivers
  ARM: omap2plus_defconfig: enable ahci-dm816 module
  arm: set CONFIG_MMC_BCM2835=y in bcm2835_defconfig and multi_v7_defconfig
  ARM: bcm2835: Enable missing CMA settings for VC4 driver
  ARM: socfpga: updates for socfpga_defconfig
  ARM: imx_v6_v7_defconfig: Select hid-multitouchdriver
  ARM: imx_v6_v7_defconfig: Select max11801_ts touchscreen driver
  ARM: exynos_defconfig: Increase CONFIG_CMA_SIZE_MBYTES to 96
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index 6aa7be191f1aadee3371254703d2a0dc5c4abc21,354bb75f3163036bff3b997c4f751f3ca4851a01..2685e03600b11bc1d48a2a12ca1a80e4de18adea
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -195,7 -195,7 +195,7 @@@ CONFIG_DMA_CMA=
  CONFIG_CMA_SIZE_MBYTES=64
  CONFIG_OMAP_OCP2SCP=y
  CONFIG_SIMPLE_PM_BUS=y
- CONFIG_SUNXI_RSB=m
+ CONFIG_SUNXI_RSB=y
  CONFIG_MTD=y
  CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_BLOCK=y
@@@ -482,9 -482,10 +482,10 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_ATMEL_FLEXCOM=y
  CONFIG_MFD_ATMEL_HLCDC=m
  CONFIG_MFD_BCM590XX=y
+ CONFIG_MFD_AC100=y
  CONFIG_MFD_AXP20X=y
- CONFIG_MFD_AXP20X_I2C=m
- CONFIG_MFD_AXP20X_RSB=m
+ CONFIG_MFD_AXP20X_I2C=y
+ CONFIG_MFD_AXP20X_RSB=y
  CONFIG_MFD_CROS_EC=m
  CONFIG_MFD_CROS_EC_I2C=m
  CONFIG_MFD_CROS_EC_SPI=m
@@@ -513,7 -514,7 +514,7 @@@ CONFIG_REGULATOR_ACT8865=
  CONFIG_REGULATOR_ANATOP=y
  CONFIG_REGULATOR_AS3711=y
  CONFIG_REGULATOR_AS3722=y
- CONFIG_REGULATOR_AXP20X=m
+ CONFIG_REGULATOR_AXP20X=y
  CONFIG_REGULATOR_BCM590XX=y
  CONFIG_REGULATOR_DA9210=y
  CONFIG_REGULATOR_FAN53555=y
@@@ -593,10 -594,10 +594,10 @@@ CONFIG_DRM_EXYNOS_DPI=
  CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_ROCKCHIP=m
- CONFIG_ROCKCHIP_ANALOGIX_DP=m
- CONFIG_ROCKCHIP_DW_HDMI=m
- CONFIG_ROCKCHIP_DW_MIPI_DSI=m
- CONFIG_ROCKCHIP_INNO_HDMI=m
+ CONFIG_ROCKCHIP_ANALOGIX_DP=y
+ CONFIG_ROCKCHIP_DW_HDMI=y
+ CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+ CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_ATMEL_HLCDC=m
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
@@@ -730,6 -731,7 +731,7 @@@ CONFIG_MMC_DW_EXYNOS=
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SH_MMCIF=y
  CONFIG_MMC_SUNXI=y
+ CONFIG_MMC_BCM2835=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_CLASS_FLASH=m
@@@ -748,9 -750,11 +750,10 @@@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=
  CONFIG_LEDS_TRIGGER_TRANSIENT=y
  CONFIG_LEDS_TRIGGER_CAMERA=y
  CONFIG_EDAC=y
 -CONFIG_EDAC_MM_EDAC=y
  CONFIG_EDAC_HIGHBANK_MC=y
  CONFIG_EDAC_HIGHBANK_L2=y
  CONFIG_RTC_CLASS=y
+ CONFIG_RTC_DRV_AC100=y
  CONFIG_RTC_DRV_AS3722=y
  CONFIG_RTC_DRV_DS1307=y
  CONFIG_RTC_DRV_HYM8563=m
@@@ -883,7 -887,7 +886,7 @@@ CONFIG_TI_PIPE3=
  CONFIG_PHY_BERLIN_USB=y
  CONFIG_PHY_BERLIN_SATA=y
  CONFIG_PHY_ROCKCHIP_DP=m
- CONFIG_PHY_ROCKCHIP_USB=m
+ CONFIG_PHY_ROCKCHIP_USB=y
  CONFIG_PHY_QCOM_APQ8064_SATA=m
  CONFIG_PHY_MIPHY28LP=y
  CONFIG_PHY_RCAR_GEN2=m

diff --combined arch/arm/configs/stm32_defconfig
index 03437f8f9ad132d8cf3686cdb257158bb545d05c,ea4132a306922928223c6c37b7cf22a192a8d59a..a0975386a96c61bfe3dfe897d81d1ed786dc3720
--- 1/arch/arm/configs/stm32_defconfig
--- 2/arch/arm/configs/stm32_defconfig
+++ b/arch/arm/configs/stm32_defconfig
@@@ -20,6 -20,7 +20,7 @@@ CONFIG_EMBEDDED=
  # CONFIG_MMU is not set
  CONFIG_ARM_SINGLE_ARMV7M=y
  CONFIG_ARCH_STM32=y
+ CONFIG_CPU_V7M_NUM_IRQ=240
  CONFIG_SET_MEM_PARAM=y
  CONFIG_DRAM_BASE=0x90000000
  CONFIG_FLASH_MEM_BASE=0x08000000
@@@ -47,6 -48,9 +48,9 @@@ CONFIG_SERIAL_NONSTANDARD=
  CONFIG_SERIAL_STM32=y
  CONFIG_SERIAL_STM32_CONSOLE=y
  # CONFIG_HW_RANDOM is not set
+ CONFIG_I2C=y
+ CONFIG_I2C_CHARDEV=y
+ CONFIG_I2C_STM32F4=y
  # CONFIG_HWMON is not set
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@@ -75,7 -79,5 +79,7 @@@ CONFIG_MAGIC_SYSRQ=
  # CONFIG_SCHED_DEBUG is not set
  # CONFIG_DEBUG_BUGVERBOSE is not set
  # CONFIG_FTRACE is not set
 +CONFIG_CRYPTO=y
 +CONFIG_CRYPTO_DEV_STM32=y
  CONFIG_CRC_ITU_T=y
  CONFIG_CRC7=y