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

Pull ARM SoC defconfig updates from Olof Johansson:
 "We keep collecting defconfig updates in a separate branch mostly to
  encourage people to handle them separately and avoid conflicts between
  different topics.

  Most of these are enablement of new drivers that have come in, or
  minor config refreshes due to reorderings in Kconfig files, etc.  I.e.
  mostly minor churn of various kinds.

  We might start folding this branch into something else for upstream
  merge since it's so small, but keep it independent in our own tree for
  the above reasons"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
  ARM: multi_v7_defconfig: enable alpine platform
  ARM: multi_v7_defconfig: Add gpio-restart driver
  ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
  ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads
  ARM: multi_v7_defconfig: Enable Tegra ACTMON support
  ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
  ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
  ARM: exynos_defconfig: Enable HDMI support
  ARM: exynos_defconfig: Enable options to mount a rootfs via NFS
  ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig
  ARM: mvebu: Enable perf support in mvebu_v7_defconfig
  ARM: exynos_defconfig: Enable ChromeOS EC chardev driver
  ARM: exynos_defconfig: Enable CPU idle
  ARM: exynos_defconfig: Enable Marvell WiFi-Ex support
  arm: qcom: Update defconfig
  arm: qcom: Enable lpass clock driver in defconfig
  ARM: omap2plus_defconfig: Enable n900 modem as loadable modules
  ARM: omap2plus_defconfig: Update bluetooth options
  ARM: omap2plus_defconfig: Enable leds-pwm
  ARM: omap1_defconfig: drop obsolete Kconfig symbols
  ...

diff --combined arch/arm/configs/imx_v4_v5_defconfig
index af07e058ba119194334ef36e4aeca5b822052f7f,5a45d3e6c52b651165a8e4c135410197a22b3dd9..d3a8018639de22d20e71e5de73a35bb1ab30309a
--- 1/arch/arm/configs/imx_v4_v5_defconfig
--- 2/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@@ -24,8 -24,9 +24,8 @@@ CONFIG_ARCH_MXC=
  CONFIG_MACH_SCB9328=y
  CONFIG_MACH_APF9328=y
  CONFIG_MACH_MX21ADS=y
 -CONFIG_MACH_MX25_3DS=y
  CONFIG_MACH_EUKREA_CPUIMX25SD=y
 -CONFIG_MACH_IMX25_DT=y
 +CONFIG_SOC_IMX25=y
  CONFIG_MACH_MX27ADS=y
  CONFIG_MACH_MX27_3DS=y
  CONFIG_MACH_IMX27_VISSTRIM_M10=y
@@@ -176,6 -177,7 +176,7 @@@ CONFIG_EXT2_FS=
  CONFIG_EXT3_FS=y
  CONFIG_EXT4_FS=y
  # CONFIG_DNOTIFY is not set
+ CONFIG_VFAT_FS=y
  # CONFIG_PROC_PAGE_MONITOR is not set
  CONFIG_TMPFS=y
  CONFIG_JFFS2_FS=y

diff --combined arch/arm/configs/multi_v7_defconfig
index 06075b6d246364db1c57b1e8860e6f675d1857c5,03039fb93e6d4dd90868582d677eba644a82f828..ab86655c1f4be22869742d274b157e5470a2bb0c
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -12,10 -12,12 +12,12 @@@ CONFIG_MODULE_UNLOAD=
  CONFIG_PARTITION_ADVANCED=y
  CONFIG_CMDLINE_PARTITION=y
  CONFIG_ARCH_VIRT=y
+ CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_MVEBU=y
  CONFIG_MACH_ARMADA_370=y
  CONFIG_MACH_ARMADA_375=y
  CONFIG_MACH_ARMADA_38X=y
+ CONFIG_MACH_ARMADA_39X=y
  CONFIG_MACH_ARMADA_XP=y
  CONFIG_MACH_DOVE=y
  CONFIG_ARCH_BCM=y
@@@ -91,6 -93,7 +93,7 @@@ CONFIG_ARCH_WM8850=
  CONFIG_ARCH_ZYNQ=y
  CONFIG_TRUSTED_FOUNDATIONS=y
  CONFIG_PCI=y
+ CONFIG_PCI_HOST_GENERIC=y
  CONFIG_PCI_KEYSTONE=y
  CONFIG_PCI_MSI=y
  CONFIG_PCI_MVEBU=y
@@@ -99,7 -102,7 +102,7 @@@ CONFIG_PCI_RCAR_GEN2=
  CONFIG_PCI_RCAR_GEN2_PCIE=y
  CONFIG_PCIEPORTBUS=y
  CONFIG_SMP=y
 -CONFIG_NR_CPUS=8
 +CONFIG_NR_CPUS=16
  CONFIG_HIGHPTE=y
  CONFIG_CMA=y
  CONFIG_ARM_APPENDED_DTB=y
@@@ -133,6 -136,9 +136,9 @@@ CONFIG_CAN_BCM=
  CONFIG_CAN_DEV=y
  CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
+ CONFIG_BT=m
+ CONFIG_BT_MRVL=m
+ CONFIG_BT_MRVL_SDIO=m
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_RFKILL=y
@@@ -200,6 -206,8 +206,8 @@@ CONFIG_USB_NET_SMSC95XX=
  CONFIG_BRCMFMAC=m
  CONFIG_RT2X00=m
  CONFIG_RT2800USB=m
+ CONFIG_MWIFIEX=m
+ CONFIG_MWIFIEX_SDIO=m
  CONFIG_INPUT_JOYDEV=y
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_GPIO=y
@@@ -208,6 -216,7 +216,7 @@@ CONFIG_KEYBOARD_SPEAR=
  CONFIG_KEYBOARD_ST_KEYSCAN=y
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_MOUSE_PS2_ELANTECH=y
+ CONFIG_MOUSE_ELAN_I2C=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=y
  CONFIG_TOUCHSCREEN_ST1232=m
@@@ -308,6 -317,7 +317,7 @@@ CONFIG_BATTERY_SBS=
  CONFIG_CHARGER_TPS65090=y
  CONFIG_POWER_RESET_AS3722=y
  CONFIG_POWER_RESET_GPIO=y
+ CONFIG_POWER_RESET_GPIO_RESTART=y
  CONFIG_POWER_RESET_KEYSTONE=y
  CONFIG_POWER_RESET_SUN6I=y
  CONFIG_POWER_RESET_RMOBILE=y
@@@ -505,7 -515,6 +515,6 @@@ CONFIG_DW_DMAC=
  CONFIG_MV_XOR=y
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_SH_DMAE=y
- CONFIG_RCAR_AUDMAC_PP=m
  CONFIG_RCAR_DMAC=y
  CONFIG_STE_DMA40=y
  CONFIG_SIRF_DMA=y
@@@ -533,6 -542,8 +542,8 @@@ CONFIG_MSM_MMCC_8960=
  CONFIG_MSM_MMCC_8974=y
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
+ CONFIG_PM_DEVFREQ=y
+ CONFIG_ARM_TEGRA_DEVFREQ=m
  CONFIG_MEMORY=y
  CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
@@@ -550,6 -561,7 +561,7 @@@ CONFIG_PHY_MIPHY365X=
  CONFIG_PHY_STIH41X_USB=y
  CONFIG_PHY_STIH407_USB=y
  CONFIG_PHY_SUN4I_USB=y
+ CONFIG_PHY_SUN9I_USB=y
  CONFIG_EXT4_FS=y
  CONFIG_AUTOFS4_FS=y
  CONFIG_MSDOS_FS=y

diff --combined arch/arm/configs/omap2plus_defconfig
index 8e108599e1af401451aeeb01a9e6b7a1752c7c0d,f18be4fbd048813dfea1fa3bdb500f7b82317b87..9ff7b54b2a837aa509b46d71b38741b7ded2c25d
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -1,3 -1,4 +1,4 @@@
+ CONFIG_KERNEL_LZMA=y
  CONFIG_SYSVIPC=y
  CONFIG_POSIX_MQUEUE=y
  CONFIG_FHANDLE=y
@@@ -86,17 -87,33 +87,33 @@@ CONFIG_IP_PNP_BOOTP=
  CONFIG_IP_PNP_RARP=y
  # CONFIG_INET_LRO is not set
  CONFIG_NETFILTER=y
+ CONFIG_PHONET=m
  CONFIG_CAN=m
  CONFIG_CAN_C_CAN=m
  CONFIG_CAN_C_CAN_PLATFORM=m
  CONFIG_BT=m
+ CONFIG_BT_RFCOMM=m
+ CONFIG_BT_RFCOMM_TTY=y
+ CONFIG_BT_BNEP=m
+ CONFIG_BT_BNEP_MC_FILTER=y
+ CONFIG_BT_BNEP_PROTO_FILTER=y
+ CONFIG_BT_HIDP=m
+ CONFIG_BT_HCIBTUSB=m
+ CONFIG_BT_HCIBTSDIO=m
  CONFIG_BT_HCIUART=m
  CONFIG_BT_HCIUART_H4=y
  CONFIG_BT_HCIUART_BCSP=y
  CONFIG_BT_HCIUART_LL=y
+ CONFIG_BT_HCIUART_3WIRE=y
  CONFIG_BT_HCIBCM203X=m
  CONFIG_BT_HCIBPA10X=m
  CONFIG_CFG80211=m
+ CONFIG_BT_HCIBFUSB=m
+ CONFIG_BT_HCIVHCI=m
+ CONFIG_BT_MRVL=m
+ CONFIG_BT_MRVL_SDIO=m
+ CONFIG_AF_RXRPC=m
+ CONFIG_RXKAD=m
  CONFIG_MAC80211=m
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
@@@ -163,6 -180,7 +180,7 @@@ CONFIG_USB_EPSON2888=
  CONFIG_USB_EHCI_HCD=m
  CONFIG_USB_OHCI_HCD=m
  CONFIG_USB_KC2190=y
+ CONFIG_USB_CDC_PHONET=m
  CONFIG_LIBERTAS=m
  CONFIG_LIBERTAS_USB=m
  CONFIG_LIBERTAS_SDIO=m
@@@ -209,6 -227,10 +227,10 @@@ CONFIG_I2C_CHARDEV=
  CONFIG_SPI=y
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_TI_QSPI=m
+ CONFIG_HSI=m
+ CONFIG_OMAP_SSI=m
+ CONFIG_NOKIA_MODEM=m
+ CONFIG_SSI_PROTOCOL=m
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_DEBUG_GPIO=y
  CONFIG_GPIO_SYSFS=y
@@@ -334,6 -356,7 +356,7 @@@ CONFIG_USB_CONFIGFS_ECM=
  CONFIG_USB_CONFIGFS_ECM_SUBSET=y
  CONFIG_USB_CONFIGFS_RNDIS=y
  CONFIG_USB_CONFIGFS_EEM=y
+ CONFIG_USB_CONFIGFS_PHONET=y
  CONFIG_USB_CONFIGFS_MASS_STORAGE=y
  CONFIG_USB_CONFIGFS_F_LB_SS=y
  CONFIG_USB_CONFIGFS_F_FS=y
@@@ -342,6 -365,7 +365,7 @@@ CONFIG_USB_CONFIGFS_F_UAC2=
  CONFIG_USB_CONFIGFS_F_MIDI=y
  CONFIG_USB_CONFIGFS_F_HID=y
  CONFIG_USB_ZERO=m
+ CONFIG_USB_G_NOKIA=m
  CONFIG_MMC=y
  CONFIG_SDIO_UART=y
  CONFIG_MMC_OMAP=y
@@@ -349,6 -373,7 +373,7 @@@ CONFIG_MMC_OMAP_HS=
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=m
  CONFIG_LEDS_GPIO=m
+ CONFIG_LEDS_PWM=m
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=m
  CONFIG_LEDS_TRIGGER_ONESHOT=m
@@@ -368,6 -393,7 +393,7 @@@ CONFIG_TI_EDMA=
  CONFIG_DMA_OMAP=y
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_EXTCON=m
+ CONFIG_EXTCON_GPIO=m
  CONFIG_EXTCON_PALMAS=m
  CONFIG_TI_EMIF=m
  CONFIG_PWM=y
@@@ -377,7 -403,6 +403,7 @@@ CONFIG_PWM_TWL=
  CONFIG_PWM_TWL_LED=m
  CONFIG_OMAP_USB2=m
  CONFIG_TI_PIPE3=y
 +CONFIG_TWL4030_USB=m
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
@@@ -390,6 -415,7 +416,7 @@@ CONFIG_MSDOS_FS=
  CONFIG_VFAT_FS=y
  CONFIG_TMPFS=y
  CONFIG_TMPFS_POSIX_ACL=y
+ CONFIG_CONFIGFS_FS=y
  CONFIG_JFFS2_FS=y
  CONFIG_JFFS2_SUMMARY=y
  CONFIG_JFFS2_FS_XATTR=y