Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull ARM SoC defconfig changes from Arnd Bergmann:
 "This is a collection of the various changes to defconfig files, most
  importantly enabling some additional platforms in the
  multi_v7_defconfig file"

* tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
  ARM: configs: fix duplicate entry in multi_v7
  ARM: multi_v7_defconfig: add missing Tegra options
  ARM: bcm2835: enable USB_DWC2_HOST in defconfig
  ARM: meson: update multi_v7_defconfig
  ARM: multi_v7_defconfig: Enable Mediatek platform
  ARM: qcom: Update defconfig
  ARM: mvebu: add gpio-fan to mvebu_v7_defconfig
  ARM: mvebu: add LED class support built-in in mvebu_v7_defconfig
  ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
  ARM: LPC32xx: defconfig update
  ARM: configs: Enable cpufreq-cpu0 for multi_v7_defconfig
  ARM: configs: Remove REGULATOR_VIRTUAL_CONSUMER from defconfigs
  ARM: tegra: enable Atmel touchpad in defconfig
  ARM: at91: sama5: update defconfig
  ARM: at91: at91sam9rl: update defconfig
  ARM: at91: at91sam9g45: update defconfig
  ARM: at91: at91sam9263: update defconfig
  ARM: at91: at91sam9261_9g10: update defconfig
  ARM: at91: at91sam9260_9g20: update defconfig
  ARM: at91: at91_dt: update defconfig
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index 691117bc7e2bff9b84c76a8c068f1c3745c523f7,f5a30ca195dafec6ae407c30cf6c5a3224aa0b99..491b7d5523bf8f2d2f741f078739b168443dfa8d
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -28,8 -28,8 +28,9 @@@ CONFIG_ARCH_HIGHBANK=
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_HI3xxx=y
  CONFIG_ARCH_HIX5HD2=y
 +CONFIG_ARCH_HIP04=y
  CONFIG_ARCH_KEYSTONE=y
+ CONFIG_ARCH_MESON=y
  CONFIG_ARCH_MXC=y
  CONFIG_SOC_IMX51=y
  CONFIG_SOC_IMX53=y
@@@ -43,6 -43,7 +44,7 @@@ CONFIG_SOC_AM33XX=
  CONFIG_SOC_AM43XX=y
  CONFIG_SOC_DRA7XX=y
  CONFIG_ARCH_QCOM=y
+ CONFIG_ARCH_MEDIATEK=y
  CONFIG_ARCH_MSM8X60=y
  CONFIG_ARCH_MSM8960=y
  CONFIG_ARCH_MSM8974=y
@@@ -75,6 -76,7 +77,7 @@@ CONFIG_PCI=
  CONFIG_PCI_MSI=y
  CONFIG_PCI_MVEBU=y
  CONFIG_PCI_TEGRA=y
+ CONFIG_PCIEPORTBUS=y
  CONFIG_SMP=y
  CONFIG_NR_CPUS=8
  CONFIG_HIGHPTE=y
@@@ -87,6 -89,7 +90,7 @@@ CONFIG_CPU_FREQ_STAT_DETAILS=
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_IDLE=y
  CONFIG_NEON=y
+ CONFIG_ARM_ZYNQ_CPUIDLE=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -107,6 -110,7 +111,7 @@@ CONFIG_CAN=
  CONFIG_CAN_RAW=y
  CONFIG_CAN_BCM=y
  CONFIG_CAN_DEV=y
+ CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
@@@ -120,7 -124,10 +125,10 @@@ CONFIG_CMA_SIZE_MBYTES=6
  CONFIG_OMAP_OCP2SCP=y
  CONFIG_MTD=y
  CONFIG_MTD_M25P80=y
+ CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
+ CONFIG_AD525X_DPOT=y
+ CONFIG_AD525X_DPOT_I2C=y
  CONFIG_ICS932S401=y
  CONFIG_APDS9802ALS=y
  CONFIG_ISL29003=y
@@@ -130,9 -137,11 +138,11 @@@ CONFIG_BLK_DEV_SD=
  CONFIG_BLK_DEV_SR=y
  CONFIG_SCSI_MULTI_LUN=y
  CONFIG_ATA=y
+ CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
  CONFIG_AHCI_ST=y
  CONFIG_AHCI_SUNXI=y
+ CONFIG_AHCI_TEGRA=y
  CONFIG_SATA_HIGHBANK=y
  CONFIG_SATA_MV=y
  CONFIG_NETDEVICES=y
@@@ -147,6 -156,7 +157,7 @@@ CONFIG_R8169=
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=y
  CONFIG_TI_CPSW=y
+ CONFIG_XILINX_EMACLITE=y
  CONFIG_AT803X_PHY=y
  CONFIG_MARVELL_PHY=y
  CONFIG_ICPLUS_PHY=y
@@@ -157,6 -167,7 +168,7 @@@ CONFIG_USB_NET_SMSC95XX=
  CONFIG_BRCMFMAC=m
  CONFIG_RT2X00=m
  CONFIG_RT2800USB=m
+ CONFIG_INPUT_JOYDEV=y
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_KEYBOARD_TEGRA=y
@@@ -165,6 -176,7 +177,7 @@@ CONFIG_KEYBOARD_ST_KEYSCAN=
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_MOUSE_PS2_ELANTECH=y
  CONFIG_INPUT_TOUCHSCREEN=y
+ CONFIG_TOUCHSCREEN_ATMEL_MXT=y
  CONFIG_TOUCHSCREEN_STMPE=y
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MPU3050=y
@@@ -174,6 -186,8 +187,8 @@@ CONFIG_SERIAL_8250_CONSOLE=
  CONFIG_SERIAL_8250_DW=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+ CONFIG_SERIAL_MESON=y
+ CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
  CONFIG_SERIAL_SIRFSOC=y
@@@ -206,6 -220,8 +221,8 @@@ CONFIG_I2C_SIRF=
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_ST=y
  CONFIG_SPI=y
+ CONFIG_I2C_XILINX=y
+ CONFIG_SPI_CADENCE=y
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
@@@ -215,11 -231,14 +232,14 @@@ CONFIG_SPI_SUN6I=
  CONFIG_SPI_TEGRA114=y
  CONFIG_SPI_TEGRA20_SFLASH=y
  CONFIG_SPI_TEGRA20_SLINK=y
+ CONFIG_SPI_XILINX=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_GENERIC_PLATFORM=y
  CONFIG_GPIO_DWAPB=y
+ CONFIG_GPIO_XILINX=y
+ CONFIG_GPIO_ZYNQ=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
  CONFIG_GPIO_TWL4030=y
@@@ -238,6 -257,7 +258,7 @@@ CONFIG_ARMADA_THERMAL=
  CONFIG_ST_THERMAL_SYSCFG=y
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
+ CONFIG_XILINX_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
  CONFIG_MFD_AS3722=y
@@@ -251,7 -271,6 +272,6 @@@ CONFIG_MFD_PALMAS=
  CONFIG_MFD_TPS65090=y
  CONFIG_MFD_TPS6586X=y
  CONFIG_MFD_TPS65910=y
- CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
  CONFIG_REGULATOR_AB8500=y
  CONFIG_REGULATOR_AS3722=y
  CONFIG_REGULATOR_BCM590XX=y
@@@ -282,6 -301,7 +302,7 @@@ CONFIG_BACKLIGHT_LCD_SUPPORT=
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
  CONFIG_BACKLIGHT_PWM=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
+ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
  CONFIG_SOUND=y
  CONFIG_SND=y
  CONFIG_SND_SOC=y
@@@ -334,7 -354,18 +355,18 @@@ CONFIG_MMC_DW=
  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_TIMER=y
+ CONFIG_LEDS_TRIGGER_ONESHOT=y
+ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+ CONFIG_LEDS_TRIGGER_CPU=y
+ CONFIG_LEDS_TRIGGER_GPIO=y
+ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+ CONFIG_LEDS_TRIGGER_TRANSIENT=y
+ CONFIG_LEDS_TRIGGER_CAMERA=y
  CONFIG_EDAC=y
  CONFIG_EDAC_MM_EDAC=y
  CONFIG_EDAC_HIGHBANK_MC=y
@@@ -350,6 -381,7 +382,7 @@@ CONFIG_RTC_DRV_TPS65910=
  CONFIG_RTC_DRV_EM3027=y
  CONFIG_RTC_DRV_PL031=y
  CONFIG_RTC_DRV_VT8500=y
+ CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_SUNXI=y
  CONFIG_RTC_DRV_MV=y
  CONFIG_RTC_DRV_TEGRA=y
@@@ -365,6 -397,7 +398,7 @@@ CONFIG_IMX_SDMA=
  CONFIG_IMX_DMA=y
  CONFIG_MXS_DMA=y
  CONFIG_DMA_OMAP=y
+ CONFIG_XILINX_VDMA=y
  CONFIG_STAGING=y
  CONFIG_SENSORS_ISL29018=y
  CONFIG_SENSORS_ISL29028=y
@@@ -372,6 -405,7 +406,7 @@@ CONFIG_MFD_NVEC=
  CONFIG_KEYBOARD_NVEC=y
  CONFIG_SERIO_NVEC_PS2=y
  CONFIG_NVEC_POWER=y
+ CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_MSM_GCC_8660=y
@@@ -381,6 -415,7 +416,7 @@@ CONFIG_TEGRA_IOMMU_GART=
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_MEMORY=y
  CONFIG_IIO=y
+ CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
  CONFIG_PWM=y
  CONFIG_PWM_TEGRA=y
@@@ -404,3 -439,4 +440,4 @@@ CONFIG_DEBUG_FS=
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_LOCKUP_DETECTOR=y
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
+ CONFIG_GENERIC_CPUFREQ_CPU0=y

diff --combined arch/arm/configs/sama5_defconfig
index 12007282b557fa2e8834c0c91f89969a34bf6b7a,96c15b775d57dc9a7490a40816030deb83265555..c9089c927daf0e4f5a84dba71f5cae85ea2e13c6
--- 1/arch/arm/configs/sama5_defconfig
--- 2/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@@ -19,10 -19,8 +19,9 @@@ CONFIG_MODULE_FORCE_UNLOAD=
  CONFIG_ARCH_AT91=y
  CONFIG_SOC_SAM_V7=y
  CONFIG_SOC_SAMA5D3=y
 +CONFIG_SOC_SAMA5D4=y
  CONFIG_MACH_SAMA5_DT=y
  CONFIG_AEABI=y
- # CONFIG_OABI_COMPAT is not set
  CONFIG_UACCESS_WITH_MEMCPY=y
  CONFIG_ZBOOT_ROM_TEXT=0x0
  CONFIG_ZBOOT_ROM_BSS=0x0
@@@ -66,15 -64,14 +65,14 @@@ CONFIG_DEVTMPFS_MOUNT=
  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
  CONFIG_MTD=y
  CONFIG_MTD_CMDLINE_PARTS=y
- CONFIG_MTD_CHAR=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CFI=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=y
  CONFIG_MTD_NAND_ATMEL=y
+ CONFIG_MTD_SPI_NOR=y
  CONFIG_MTD_UBI=y
  CONFIG_MTD_UBI_GLUEBI=y
- CONFIG_PROC_DEVICETREE=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=4
@@@ -84,10 -81,8 +82,8 @@@ CONFIG_ATMEL_SSC=
  CONFIG_EEPROM_AT24=y
  CONFIG_SCSI=y
  CONFIG_BLK_DEV_SD=y
- CONFIG_SCSI_MULTI_LUN=y
  # CONFIG_SCSI_LOWLEVEL is not set
  CONFIG_NETDEVICES=y
- CONFIG_MII=y
  CONFIG_MACB=y
  # CONFIG_NET_VENDOR_BROADCOM is not set
  # CONFIG_NET_VENDOR_CIRRUS is not set
@@@ -136,6 -131,8 +132,8 @@@ CONFIG_SPI=
  CONFIG_SPI_ATMEL=y
  CONFIG_SPI_GPIO=y
  CONFIG_GPIO_SYSFS=y
+ CONFIG_POWER_SUPPLY=y
+ CONFIG_POWER_RESET=y
  # CONFIG_HWMON is not set
  CONFIG_SSB=m
  CONFIG_REGULATOR=y
@@@ -146,6 -143,11 +144,11 @@@ CONFIG_BACKLIGHT_LCD_SUPPORT=
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
  # CONFIG_BACKLIGHT_GENERIC is not set
  CONFIG_FRAMEBUFFER_CONSOLE=y
+ CONFIG_SOUND=y
+ CONFIG_SND=y
+ CONFIG_SND_SOC=y
+ CONFIG_SND_ATMEL_SOC=y
+ CONFIG_SND_ATMEL_SOC_WM8904=y
  # CONFIG_HID_GENERIC is not set
  CONFIG_USB=y
  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@@ -166,6 -168,7 +169,7 @@@ CONFIG_MMC_ATMELMCI=
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
+ CONFIG_LEDS_PWM=y
  CONFIG_LEDS_TRIGGER_TIMER=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_GPIO=y
@@@ -175,6 -178,8 +179,8 @@@ CONFIG_DMADEVICES=
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_IIO=y
  CONFIG_AT91_ADC=y
+ CONFIG_PWM=y
+ CONFIG_PWM_ATMEL=y
  CONFIG_EXT4_FS=y
  CONFIG_FANOTIFY=y
  CONFIG_VFAT_FS=y
@@@ -189,8 -194,8 +195,8 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_NLS_UTF8=y
  CONFIG_STRIP_ASM_SYMS=y
  CONFIG_DEBUG_FS=y
- # CONFIG_SCHED_DEBUG is not set
  CONFIG_DEBUG_MEMORY_INIT=y
+ # CONFIG_SCHED_DEBUG is not set
  # CONFIG_FTRACE is not set
  CONFIG_DEBUG_USER=y
  CONFIG_DEBUG_LL=y