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

Pull ARM SoC defconfig updates from Olof Johansson:
 "We broke this out in a separate branch since some defconfigs now are
  shared between maintainers, and having them merged in through separate
  topics (drivers/soc/etc) is a recipe for conflicts.

  Most of this is removal of two defconfigs:

   - Kirkwood, now folded into mvebu/multi_v5
   - Renesas genmai, removed platform
   - major defconfig refresh for exynos
   - various updates on the other multi-defconfigs and others (tegra,
     socfpga, shmobile):

* tag 'defconfig-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: multi_v7_defconfig: Enable TI PIPE3 PHY driver
  ARM: config: enable ARCH_HIX5HD2
  ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY
  ARM: multi_v7_defconfig: Enable ST's (S)ATA driver
  ARM: multi_v7_defconfig: add ST Keyscan driver
  ARM: update multi_v7_defconfig for STI
  ARM: multi_v7_defconfig: Configure in ST's Thermal Controller
  ARM: exynos_defconfig: Update exynos_defconfig
  ARM: shmobile: defconfig: Remove MACH_GENMAI
  ARM: mvebu: update mvebu_v7_defconfig with cpufreq support
  ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig
  ARM: shmobile: genmai: remove defconfig
  ARM: socfpga: Update socfpga_defconfig
  ARM: Kirkwood: Remove kirkwood_defconfig
  ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig
  ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig
  ARM: mvebu: add devtmpfs to mvebu_v5_defconfig
  ARM: mvebu: add appended DTB support in mvebu_v5_defconfig
  ARM: multi_v7: enable igb, stmpe, lm95245, pwm leds
  ARM: multi_v7_defconfig: Enable ST's I2C driver
  ...

diff --combined arch/arm/configs/multi_v7_defconfig
index 3332a4231684a3794030d41367aa284dbec743ce,a0bdb232caf16518800dfca02ba20064241dea39..5fb95fb758d9a43ae6ef5ccfd25ee2ff304f5006
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -19,16 -19,17 +19,18 @@@ CONFIG_MACH_DOVE=
  CONFIG_ARCH_BCM=y
  CONFIG_ARCH_BCM_MOBILE=y
  CONFIG_ARCH_BCM_5301X=y
 +CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_MACH_BERLIN_BG2=y
  CONFIG_MACH_BERLIN_BG2CD=y
  CONFIG_MACH_BERLIN_BG2Q=y
  CONFIG_ARCH_HIGHBANK=y
+ CONFIG_ARCH_HISI=y
  CONFIG_ARCH_HI3xxx=y
+ CONFIG_ARCH_HIX5HD2=y
  CONFIG_ARCH_KEYSTONE=y
  CONFIG_ARCH_MXC=y
 -CONFIG_MACH_IMX51_DT=y
 +CONFIG_SOC_IMX51=y
  CONFIG_SOC_IMX53=y
  CONFIG_SOC_IMX6Q=y
  CONFIG_SOC_IMX6SL=y
@@@ -67,7 -68,6 +69,6 @@@ CONFIG_ARCH_VEXPRESS=
  CONFIG_ARCH_VEXPRESS_CA9X4=y
  CONFIG_ARCH_WM8850=y
  CONFIG_ARCH_ZYNQ=y
- CONFIG_NEON=y
  CONFIG_TRUSTED_FOUNDATIONS=y
  CONFIG_PCI=y
  CONFIG_PCI_MSI=y
@@@ -84,6 -84,7 +85,7 @@@ CONFIG_CPU_FREQ=
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_IDLE=y
+ CONFIG_NEON=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -128,6 -129,7 +130,7 @@@ CONFIG_BLK_DEV_SR=
  CONFIG_SCSI_MULTI_LUN=y
  CONFIG_ATA=y
  CONFIG_SATA_AHCI_PLATFORM=y
+ CONFIG_AHCI_ST=y
  CONFIG_AHCI_SUNXI=y
  CONFIG_SATA_HIGHBANK=y
  CONFIG_SATA_MV=y
@@@ -135,6 -137,7 +138,7 @@@ CONFIG_NETDEVICES=
  CONFIG_SUN4I_EMAC=y
  CONFIG_MACB=y
  CONFIG_NET_CALXEDA_XGMAC=y
+ CONFIG_IGB=y
  CONFIG_MV643XX_ETH=y
  CONFIG_MVNETA=y
  CONFIG_KS8851=y
@@@ -156,8 -159,11 +160,11 @@@ CONFIG_INPUT_EVDEV=
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_KEYBOARD_TEGRA=y
  CONFIG_KEYBOARD_SPEAR=y
+ CONFIG_KEYBOARD_ST_KEYSCAN=y
  CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_MOUSE_PS2_ELANTECH=y
+ CONFIG_INPUT_TOUCHSCREEN=y
+ CONFIG_TOUCHSCREEN_STMPE=y
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MPU3050=y
  CONFIG_SERIO_AMBAKMI=y
@@@ -196,6 -202,7 +203,7 @@@ CONFIG_I2C_EXYNOS5=
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_SIRF=y
  CONFIG_I2C_TEGRA=y
+ CONFIG_I2C_ST=y
  CONFIG_SPI=y
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
@@@ -223,8 -230,11 +231,11 @@@ CONFIG_POWER_RESET_AS3722=
  CONFIG_POWER_RESET_GPIO=y
  CONFIG_POWER_RESET_SUN6I=y
  CONFIG_SENSORS_LM90=y
+ CONFIG_SENSORS_LM95245=y
  CONFIG_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
+ CONFIG_ST_THERMAL_SYSCFG=y
+ CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
@@@ -234,6 -244,7 +245,7 @@@ CONFIG_MFD_CROS_EC=
  CONFIG_MFD_CROS_EC_SPI=y
  CONFIG_MFD_MAX8907=y
  CONFIG_MFD_SEC_CORE=y
+ CONFIG_MFD_STMPE=y
  CONFIG_MFD_PALMAS=y
  CONFIG_MFD_TPS65090=y
  CONFIG_MFD_TPS6586X=y
@@@ -312,12 -323,16 +324,16 @@@ CONFIG_MMC_SDHCI_SPEAR=
  CONFIG_MMC_SDHCI_S3C=y
  CONFIG_MMC_SDHCI_S3C_DMA=y
  CONFIG_MMC_SDHCI_BCM_KONA=y
+ CONFIG_MMC_SDHCI_ST=y
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
  CONFIG_MMC_MVSDIO=y
  CONFIG_MMC_SUNXI=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_EXYNOS=y
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
+ CONFIG_LEDS_PWM=y
  CONFIG_EDAC=y
  CONFIG_EDAC_MM_EDAC=y
  CONFIG_EDAC_HIGHBANK_MC=y
@@@ -369,6 -384,8 +385,8 @@@ CONFIG_PWM=
  CONFIG_PWM_TEGRA=y
  CONFIG_PWM_VT8500=y
  CONFIG_OMAP_USB2=y
+ CONFIG_TI_PIPE3=y
+ CONFIG_PHY_MIPHY365X=y
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_EXT4_FS=y
  CONFIG_VFAT_FS=y