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

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "As usual, a bunch of commits, mostly adding drivers and other options
  to defconfigs.

  The realview_smp_defconfig and realview_defconfig got merged into one,
  so we are now down to 110 files.

  For stm32, we have now added a Kconfig fragment, the first such file
  on arch/arm.  The purpose here is to have a shared defconfig file that
  works for all boards, while the DRAM offset has to be hardwired on
  NOMMU machines at compile time.

  The Exynos defconfig changes depend on changes in the RTC tree, so
  this is pulled in here, but has already been merged into 4.6 now"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
  ARM: imx_v4_v5_defconfig: Enable initramfs support
  ARM: imx_v4_v5_defconfig: Cleanup imx_v4_v5_defconfig
  ARM: multi_v7_defconfig: Enable LP872x regulator support
  ARM: omap2plus_defconfig: Enable LP872x regulator support
  ARM: mxs_defconfig: Enable initramfs support
  ARM: mxs_defconfig: Cleanup mxs_defconfig
  ARM: multi_v5_defconfig: Enable initramfs support
  ARM: multi_v5_defconfig: Cleanup multi_v5_defconfig
  ARM: multi_v7_defconfig: enable useful configurations for Vybrid
  ARM: multi_v7_defconfig: add MACH_ARTPEC6
  ARM: omap2plus_defconfig: Enable AT24 eeprom
  ARM: omap2plus_defconfig: Enable TI TVP5150 video decoder support
  ARM: omap2plus_defconfig: Enable ISP support and dependencies
  ARM: omap2plus_defconfig: Enable OMAP IOMMU support
  ARM: socfpga_defconfig: enable support for initramfs/initrd support
  ARM: at91/defconfig: add sama5d2 adc support in sama5_defconfig
  ARM: multi_v7_defconfig: Enable BCM283x
  ARM: bcm2835_defconfig: Enable RPi power domain driver
  ARM: bcm2835_defconfig: Enable RPi firmware driver
  ARM: bcm2835_defconfig: enable ARMv7 support
  ...

diff --combined arch/arm/configs/multi_v5_defconfig
index afb1f62fb05e303ed5b6bb6077101e5c0777748e,ab503c2c8cdd063f8b3bda85e674b435a8e7e0dc..e11d99d529ee913c589f20d3988b5a0462b3373f
--- 1/arch/arm/configs/multi_v5_defconfig
--- 2/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@@ -2,6 -2,7 +2,7 @@@ CONFIG_SYSVIPC=
  CONFIG_NO_HZ=y
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_LOG_BUF_SHIFT=19
+ CONFIG_BLK_DEV_INITRD=y
  CONFIG_PROFILING=y
  CONFIG_OPROFILE=y
  CONFIG_KPROBES=y
@@@ -91,15 -92,15 +92,15 @@@ CONFIG_SATA_MV=
  CONFIG_NETDEVICES=y
  CONFIG_NET_DSA_MV88E6060=y
  CONFIG_NET_DSA_MV88E6131=y
 -CONFIG_NET_DSA_MV88E6123_61_65=y
 +CONFIG_NET_DSA_MV88E6123=y
  CONFIG_NET_DSA_MV88E6171=y
  CONFIG_NET_DSA_MV88E6352=y
  CONFIG_MV643XX_ETH=y
  CONFIG_R8169=y
  CONFIG_MARVELL_PHY=y
- CONFIG_MWL8K=m
  CONFIG_LIBERTAS=y
  CONFIG_LIBERTAS_SDIO=y
+ CONFIG_MWL8K=m
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_GPIO=y
  # CONFIG_INPUT_MOUSE is not set

diff --combined arch/arm/configs/mvebu_v5_defconfig
index 6c4c54037bc4ca6ca6826b2b21c80777a2b430d9,9317e5a5b730c6f506918cb949ffe07de6add073..4562006aae68afc067aa96394499086d62726dfa
--- 1/arch/arm/configs/mvebu_v5_defconfig
--- 2/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@@ -92,7 -92,7 +92,7 @@@ CONFIG_SATA_MV=
  CONFIG_NETDEVICES=y
  CONFIG_NET_DSA_MV88E6060=y
  CONFIG_NET_DSA_MV88E6131=y
 -CONFIG_NET_DSA_MV88E6123_61_65=y
 +CONFIG_NET_DSA_MV88E6123=y
  CONFIG_NET_DSA_MV88E6171=y
  CONFIG_NET_DSA_MV88E6352=y
  CONFIG_MV643XX_ETH=y
@@@ -137,6 -137,7 +137,7 @@@ CONFIG_SND=
  CONFIG_SND_SOC=y
  CONFIG_SND_KIRKWOOD_SOC=y
  CONFIG_SND_SOC_ALC5623=y
+ CONFIG_SND_SOC_CS42L51_I2C=y
  CONFIG_SND_SIMPLE_CARD=y
  CONFIG_HID_DRAGONRISE=y
  CONFIG_HID_GYRATION=y

diff --combined arch/arm/configs/omap2plus_defconfig
index d18d6b42fcf52f9db076af65a0f6aad022a1173c,0895b4bc20ff57ea65aec868fb66bd5d65101260..156bc88b8523f955fd618180ccb422182e2cfc88
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -145,6 -145,7 +145,7 @@@ CONFIG_BLK_DEV_RAM_SIZE=1638
  CONFIG_SENSORS_TSL2550=m
  CONFIG_BMP085_I2C=m
  CONFIG_SRAM=y
+ CONFIG_EEPROM_AT24=m
  CONFIG_SENSORS_LIS3_I2C=m
  CONFIG_BLK_DEV_SD=y
  CONFIG_SCSI_SCAN_ASYNC=y
@@@ -278,6 -279,7 +279,7 @@@ CONFIG_MFD_TPS65218=
  CONFIG_MFD_TPS65910=y
  CONFIG_MFD_TI_AM335X_TSCADC=m
  CONFIG_TWL6040_CORE=y
+ CONFIG_REGULATOR_LP872X=y
  CONFIG_REGULATOR_PALMAS=y
  CONFIG_REGULATOR_PBIAS=y
  CONFIG_REGULATOR_TI_ABB=y
@@@ -288,27 -290,36 +290,35 @@@ CONFIG_REGULATOR_TPS65217=
  CONFIG_REGULATOR_TPS65218=y
  CONFIG_REGULATOR_TPS65910=y
  CONFIG_REGULATOR_TWL4030=y
+ CONFIG_MEDIA_SUPPORT=m
+ CONFIG_MEDIA_CAMERA_SUPPORT=y
+ CONFIG_MEDIA_CONTROLLER=y
+ CONFIG_VIDEO_V4L2_SUBDEV_API=y
+ CONFIG_V4L_PLATFORM_DRIVERS=y
+ CONFIG_VIDEO_OMAP3=m
+ # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+ CONFIG_VIDEO_TVP5150=m
  CONFIG_FB=y
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y
  CONFIG_FB_TILEBLITTING=y
 -CONFIG_OMAP2_DSS=m
 -CONFIG_OMAP5_DSS_HDMI=y
 -CONFIG_OMAP2_DSS_SDI=y
 -CONFIG_OMAP2_DSS_DSI=y
 +CONFIG_FB_OMAP5_DSS_HDMI=y
 +CONFIG_FB_OMAP2_DSS_SDI=y
 +CONFIG_FB_OMAP2_DSS_DSI=y
  CONFIG_FB_OMAP2=m
 -CONFIG_DISPLAY_ENCODER_TFP410=m
 -CONFIG_DISPLAY_ENCODER_TPD12S015=m
 -CONFIG_DISPLAY_CONNECTOR_DVI=m
 -CONFIG_DISPLAY_CONNECTOR_HDMI=m
 -CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
 -CONFIG_DISPLAY_PANEL_DPI=m
 -CONFIG_DISPLAY_PANEL_DSI_CM=m
 -CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
 -CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
 -CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 -CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
 -CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 -CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
 +CONFIG_FB_OMAP2_ENCODER_TFP410=m
 +CONFIG_FB_OMAP2_ENCODER_TPD12S015=m
 +CONFIG_FB_OMAP2_CONNECTOR_DVI=m
 +CONFIG_FB_OMAP2_CONNECTOR_HDMI=m
 +CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV=m
 +CONFIG_FB_OMAP2_PANEL_DPI=m
 +CONFIG_FB_OMAP2_PANEL_DSI_CM=m
 +CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM=m
 +CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02=m
 +CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01=m
 +CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1=m
 +CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1=m
 +CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11=m
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
  CONFIG_LCD_CLASS_DEVICE=y
  CONFIG_LCD_PLATFORM=y
@@@ -411,7 -422,8 +421,8 @@@ CONFIG_RTC_DRV_OMAP=
  CONFIG_DMADEVICES=y
  CONFIG_TI_EDMA=y
  CONFIG_DMA_OMAP=y
- # CONFIG_IOMMU_SUPPORT is not set
+ CONFIG_IOMMU_SUPPORT=y
+ CONFIG_OMAP_IOMMU=y
  CONFIG_EXTCON=m
  CONFIG_EXTCON_USB_GPIO=m
  CONFIG_EXTCON_PALMAS=m