Merge tag 'omap-for-v4.6/defconfig-signed' of git://git.kernel.org/pub/scm/linux...

Merge "omap defconfig changes for v4.6 merge window" from Tony Lindgren:

Defconfig changes for omap2plus_defconfig and multi_v7_defconfig
for v4.6 merge window:

- Enable IOMMU and omap3isp so we can enable TVP5150/1 video
  decoder

- Enable at24 eeprom for revision detection on beagle-x15

- Enable LP872x regulator for both omap2plus_defconfig and
  multi_v7_defconfig as it's needed at least by LG Optimus
  Black

* tag 'omap-for-v4.6/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: multi_v7_defconfig: Enable LP872x regulator support
  ARM: omap2plus_defconfig: Enable LP872x regulator support
  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

diff --combined arch/arm/configs/multi_v7_defconfig
index 1efee9ef2b52c6be6f9a24042ca6f6aa23ebfe1e,bc44876636d0706b39b889b87468c2a4c237bf8f..28234906a0646c6bd98e796d64d5eae977743995
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -16,8 -16,6 +16,8 @@@ CONFIG_ARCH_MULTI_V7=
  # CONFIG_ARCH_MULTI_V4 is not set
  CONFIG_ARCH_VIRT=y
  CONFIG_ARCH_ALPINE=y
 +CONFIG_ARCH_ARTPEC=y
 +CONFIG_MACH_ARTPEC6=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_ARMADA_370=y
  CONFIG_MACH_ARMADA_375=y
@@@ -35,7 -33,6 +35,7 @@@ CONFIG_ARCH_BCM_NSP=
  CONFIG_ARCH_BCM_21664=y
  CONFIG_ARCH_BCM_281XX=y
  CONFIG_ARCH_BCM_5301X=y
 +CONFIG_ARCH_BCM2835=y
  CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_MACH_BERLIN_BG2=y
@@@ -185,7 -182,6 +185,7 @@@ CONFIG_MTD_M25P80=
  CONFIG_MTD_NAND=y
  CONFIG_MTD_NAND_ATMEL=y
  CONFIG_MTD_NAND_BRCMNAND=y
 +CONFIG_MTD_NAND_VF610_NFC=y
  CONFIG_MTD_NAND_DAVINCI=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_SPI_FSL_QUADSPI=m
@@@ -231,7 -227,6 +231,7 @@@ CONFIG_R8169=
  CONFIG_SH_ETH=y
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=y
 +CONFIG_SYNOPSYS_DWC_ETH_QOS=y
  CONFIG_TI_CPSW=y
  CONFIG_XILINX_EMACLITE=y
  CONFIG_AT803X_PHY=y
@@@ -323,7 -318,6 +323,7 @@@ CONFIG_I2C_ARB_GPIO_CHALLENGE=
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_MUX_PINCTRL=y
  CONFIG_I2C_AT91=m
 +CONFIG_I2C_BCM2835=y
  CONFIG_I2C_CADENCE=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
  CONFIG_I2C_DIGICOLOR=m
@@@ -347,8 -341,6 +347,8 @@@ CONFIG_I2C_RCAR=
  CONFIG_I2C_CROS_EC_TUNNEL=m
  CONFIG_SPI=y
  CONFIG_SPI_ATMEL=m
 +CONFIG_SPI_BCM2835=y
 +CONFIG_SPI_BCM2835AUX=y
  CONFIG_SPI_CADENCE=y
  CONFIG_SPI_DAVINCI=y
  CONFIG_SPI_FSL_DSPI=m
@@@ -371,7 -363,6 +371,7 @@@ CONFIG_SPI_SPIDEV=
  CONFIG_SPMI=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
 +CONFIG_PINCTRL_BCM2835=y
  CONFIG_PINCTRL_APQ8064=y
  CONFIG_PINCTRL_APQ8084=y
  CONFIG_PINCTRL_IPQ8064=y
@@@ -412,7 -403,6 +412,7 @@@ CONFIG_POWER_RESET_KEYSTONE=
  CONFIG_POWER_RESET_RMOBILE=y
  CONFIG_POWER_AVS=y
  CONFIG_ROCKCHIP_IODOMAIN=y
 +CONFIG_SENSORS_IIO_HWMON=y
  CONFIG_SENSORS_LM90=y
  CONFIG_SENSORS_LM95245=y
  CONFIG_SENSORS_NTC_THERMISTOR=m
@@@ -436,7 -426,6 +436,7 @@@ CONFIG_SUNXI_WATCHDOG=
  CONFIG_IMX2_WDT=y
  CONFIG_TEGRA_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=y
 +CONFIG_DW_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
@@@ -478,6 -467,7 +478,7 @@@ CONFIG_REGULATOR_RK808=
  CONFIG_REGULATOR_GPIO=y
  CONFIG_MFD_SYSCON=y
  CONFIG_POWER_RESET_SYSCON=y
+ CONFIG_REGULATOR_LP872X=y
  CONFIG_REGULATOR_MAX14577=m
  CONFIG_REGULATOR_MAX8907=y
  CONFIG_REGULATOR_MAX8973=y
@@@ -538,7 -528,6 +539,7 @@@ CONFIG_DRM_RCAR_LVDS=
  CONFIG_DRM_TEGRA=y
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
 +CONFIG_DRM_VC4=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FB_WM8505=y
  CONFIG_FB_SH_MOBILE_LCDC=y
@@@ -571,7 -560,6 +572,7 @@@ CONFIG_SND_SOC_ROCKCHIP_RT5645=
  CONFIG_SND_SOC_SH4_FSI=m
  CONFIG_SND_SOC_RCAR=m
  CONFIG_SND_SOC_RSRC_CARD=m
 +CONFIG_SND_SUN4I_CODEC=m
  CONFIG_SND_SOC_SAMSUNG=m
  CONFIG_SND_SOC_SNOW=m
  CONFIG_SND_SOC_ODROIDX2=m
@@@ -590,7 -578,6 +591,7 @@@ CONFIG_SND_SOC_WM8978=
  CONFIG_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_MVEBU=y
 +CONFIG_USB_XHCI_RCAR=m
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_MSM=m
  CONFIG_USB_EHCI_EXYNOS=y
@@@ -605,12 -592,9 +606,12 @@@ CONFIG_USB_OHCI_EXYNOS=
  CONFIG_USB_R8A66597_HCD=m
  CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_MUSB_HDRC=m
 +CONFIG_USB_MUSB_SUNXI=m
  CONFIG_USB_DWC3=y
  CONFIG_USB_DWC2=m
  CONFIG_USB_CHIPIDEA=y
 +CONFIG_USB_CHIPIDEA_UDC=y
  CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_AB8500_USB=y
  CONFIG_KEYSTONE_USB_PHY=y
@@@ -620,7 -604,6 +621,7 @@@ CONFIG_USB_ISP1301=
  CONFIG_USB_MSM_OTG=m
  CONFIG_USB_MXS_PHY=y
  CONFIG_USB_GADGET=y
 +CONFIG_USB_FSL_USB2=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_USB_ETH=m
  CONFIG_MMC=y
@@@ -639,7 -622,6 +640,7 @@@ CONFIG_MMC_SDHCI_SPEAR=
  CONFIG_MMC_SDHCI_S3C=y
  CONFIG_MMC_SDHCI_S3C_DMA=y
  CONFIG_MMC_SDHCI_BCM_KONA=y
 +CONFIG_MMC_SDHCI_BCM2835=y
  CONFIG_MMC_SDHCI_ST=y
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
@@@ -683,6 -665,7 +684,6 @@@ CONFIG_RTC_DRV_MAX8907=
  CONFIG_RTC_DRV_MAX8997=m
  CONFIG_RTC_DRV_MAX77686=y
  CONFIG_RTC_DRV_RK808=m
 -CONFIG_RTC_DRV_MAX77802=m
  CONFIG_RTC_DRV_RS5C372=m
  CONFIG_RTC_DRV_PALMAS=y
  CONFIG_RTC_DRV_ST_LPC=y
@@@ -708,7 -691,7 +709,7 @@@ CONFIG_DMADEVICES=
  CONFIG_DW_DMAC=y
  CONFIG_AT_HDMAC=y
  CONFIG_AT_XDMAC=y
 -CONFIG_FSL_EDMA=m
 +CONFIG_FSL_EDMA=y
  CONFIG_MV_XOR=y
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_SH_DMAE=y
@@@ -721,7 -704,6 +722,7 @@@ CONFIG_PL330_DMA=
  CONFIG_IMX_SDMA=y
  CONFIG_IMX_DMA=y
  CONFIG_MXS_DMA=y
 +CONFIG_DMA_BCM2835=y
  CONFIG_DMA_OMAP=y
  CONFIG_QCOM_BAM_DMA=y
  CONFIG_XILINX_VDMA=y
@@@ -768,10 -750,8 +769,10 @@@ CONFIG_IIO=
  CONFIG_AT91_ADC=m
  CONFIG_BERLIN2_ADC=m
  CONFIG_EXYNOS_ADC=m
 +CONFIG_VF610_ADC=m
  CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
 +CONFIG_RASPBERRYPI_POWER=y
  CONFIG_PWM=y
  CONFIG_PWM_ATMEL=m
  CONFIG_PWM_ATMEL_TCB=m
@@@ -784,7 -764,6 +785,7 @@@ CONFIG_PWM_TEGRA=
  CONFIG_PWM_VT8500=y
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_PWM_STI=m
 +CONFIG_PWM_BCM2835=y
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_BERLIN_USB=y
@@@ -801,8 -780,6 +802,8 @@@ CONFIG_PHY_SUN9I_USB=
  CONFIG_PHY_SAMSUNG_USB2=m
  CONFIG_NVMEM=y
  CONFIG_NVMEM_SUNXI_SID=y
 +CONFIG_BCM2835_MBOX=y
 +CONFIG_RASPBERRYPI_FIRMWARE=y
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_MSDOS_FS=y

diff --combined arch/arm/configs/omap2plus_defconfig
index a7151744b85c17d8c7041f33141e7c4cf7809fec,177086867790dc4bd6b35e60f2f520dcd1fed665..0895b4bc20ff57ea65aec868fb66bd5d65101260
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -50,7 -50,6 +50,7 @@@ CONFIG_SOC_AM33XX=
  CONFIG_SOC_AM43XX=y
  CONFIG_SOC_DRA7XX=y
  CONFIG_ARM_THUMBEE=y
 +CONFIG_ARM_KERNMEM_PERMS=y
  CONFIG_ARM_ERRATA_411920=y
  CONFIG_ARM_ERRATA_430973=y
  CONFIG_SMP=y
@@@ -145,6 -144,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
@@@ -178,7 -178,6 +179,7 @@@ CONFIG_TI_CPTS=
  CONFIG_AT803X_PHY=y
  CONFIG_SMSC_PHY=y
  CONFIG_USB_USBNET=m
 +CONFIG_USB_NET_SMSC75XX=m
  CONFIG_USB_NET_SMSC95XX=m
  CONFIG_USB_ALI_M5632=y
  CONFIG_USB_AN2720=y
@@@ -278,6 -277,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,6 -288,14 +290,14 @@@ 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
@@@ -356,11 -364,6 +366,11 @@@ CONFIG_USB_MUSB_DSPS=
  CONFIG_USB_INVENTRA_DMA=y
  CONFIG_USB_TI_CPPI41_DMA=y
  CONFIG_USB_DWC3=m
 +CONFIG_USB_SERIAL=m
 +CONFIG_USB_SERIAL_GENERIC=y
 +CONFIG_USB_SERIAL_SIMPLE=m
 +CONFIG_USB_SERIAL_FTDI_SIO=m
 +CONFIG_USB_SERIAL_PL2303=m
  CONFIG_USB_TEST=m
  CONFIG_AM335X_PHY_USB=y
  CONFIG_USB_GADGET=m
@@@ -394,7 -397,6 +404,7 @@@ CONFIG_NEW_LEDS=
  CONFIG_LEDS_CLASS=m
  CONFIG_LEDS_GPIO=m
  CONFIG_LEDS_PWM=m
 +CONFIG_LEDS_PCA963X=m
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=m
  CONFIG_LEDS_TRIGGER_ONESHOT=m
@@@ -412,7 -414,8 +422,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
@@@ -457,8 -460,6 +468,8 @@@ CONFIG_NLS_CODEPAGE_437=
  CONFIG_NLS_ISO8859_1=y
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_INFO=y
 +CONFIG_DEBUG_INFO_SPLIT=y
 +CONFIG_DEBUG_INFO_DWARF4=y
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_SCHEDSTATS=y
  CONFIG_TIMER_STATS=y