From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2014 01:04:13 +0000 (-0800)
Subject: Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=151cd97630f87451cab412e40750d0e5f7581c98;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'defconfig-for-linus' of git://git./linux/kernel/git/arm/arm-soc

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.  These are split out into a separate branch
  to avoid most of the merge conflicts in the defconfig files.

  This also touches 12 other defconfig files for shmobile, at91,
  hisilicon, keystone, mvebu, omap, and tegra"

* tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
  ARM: omap2plus_defconfig: enable ECAP and EHRPWM
  ARM: omap2plus_defconfig: enable XHCI
  ARM: omap2plus_defconfig: enable AM33XX SoC sound
  ARM: omap2plus_defconfig: enable EDT FT5X06 touchscreen
  ARM: omap2plus_defconfig: remove unwanted ethernet drivers
  ARM: multi_v7_defconfig: enable MAX77686 PMIC drivers for exynos4412-prime based SoCs
  ARM: at91/defconfig: add DM9000 to at91_dt
  ARM: at91/defconfig: add QT1070 to at91_dt
  ARM: at91/defconfig: add TCB PWM driver selection
  ARM: at91/defconfig: add the XDMA driver
  ARM: at91: sama5: update defconfig
  ARM: defconfig: imx_v6_v7_defconfig updates
  ARM: multi_v7_defconfig: add driver support for hix5hd2
  ARM: exynos_defconfig: Use 16 minors per MMC block device
  ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig
  ARM: mvebu: enable i2c device in mvebu_v7_defconfig
  ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig
  ARM: tegra: Regenerate default configuration
  ARM: multi_v7_defconfig: Enable cgroups
  ARM: multi_v7_defconfig: Enable Broadcom Cygnus
  ...
---

151cd97630f87451cab412e40750d0e5f7581c98
diff --cc arch/arm/configs/multi_v7_defconfig
index 9d7a32f93fcf,afee426e0a44..d7896580f3bb
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -234,9 -243,9 +244,10 @@@ CONFIG_SPI_TEGRA114=
  CONFIG_SPI_TEGRA20_SFLASH=y
  CONFIG_SPI_TEGRA20_SLINK=y
  CONFIG_SPI_XILINX=y
+ CONFIG_SPI_SPIDEV=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
 +CONFIG_PINCTRL_APQ8084=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_GENERIC_PLATFORM=y
  CONFIG_GPIO_DWAPB=y
@@@ -261,9 -270,9 +272,10 @@@ CONFIG_ST_THERMAL_SYSCFG=
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
  CONFIG_XILINX_WATCHDOG=y
+ CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
 +CONFIG_MESON_WATCHDOG=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_CROS_EC=y
@@@ -355,8 -372,9 +375,10 @@@ CONFIG_MMC_OMAP_HS=
  CONFIG_MMC_MVSDIO=y
  CONFIG_MMC_SUNXI=y
  CONFIG_MMC_DW=y
+ CONFIG_MMC_DW_IDMAC=y
+ CONFIG_MMC_DW_PLTFM=y
  CONFIG_MMC_DW_EXYNOS=y
 +CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
@@@ -413,7 -432,7 +436,8 @@@ CONFIG_NVEC_POWER=
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
  CONFIG_COMMON_CLK_QCOM=y
+ CONFIG_COMMON_CLK_MAX77686=y
 +CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y
  CONFIG_MSM_MMCC_8974=y