Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 151cd976 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/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
  ...
parents fe78c54b d0416987

arch/arm/configs/ape6evm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_BINFMT_MISC=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/at91_dt_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_NETDEVICES=y

CONFIG_MACB=y

# CONFIG_NET_VENDOR_BROADCOM is not set

CONFIG_DM9000=y

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -113,6 +114,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272 
CONFIG_INPUT_JOYDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_QT1070=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y
@@ -186,6 +188,7 @@ CONFIG_IIO=y 
CONFIG_AT91_ADC=y

CONFIG_PWM=y

CONFIG_PWM_ATMEL=y

CONFIG_PWM_ATMEL_TCB=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

arch/arm/configs/exynos_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_DWC3=y

CONFIG_USB_HSIC_USB3503=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_S3C=y

CONFIG_MMC_SDHCI_S3C_DMA=y

arch/arm/configs/hisi_defconfig

+19 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_RD_LZMA=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_HI3xxx=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_ARCH_HIX5HD2=y

CONFIG_ARCH_HIP04=y

CONFIG_SMP=y
@@ -14,8 +16,11 @@ CONFIG_AEABI=y 
CONFIG_HIGHMEM=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_NEON=y

CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y
@@ -26,6 +31,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_HIX5HD2_GMAC=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y

CONFIG_SERIAL_8250_CONSOLE=y
@@ -39,8 +45,13 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y 
CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_GENERIC_PLATFORM=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MFD_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_DRM=y

CONFIG_FB_SIMPLE=y

CONFIG_USB=y
@@ -48,15 +59,21 @@ CONFIG_USB_XHCI_HCD=y 
CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_MMC=y

CONFIG_RTC_CLASS=y

CONFIG_MMC_DW=y

CONFIG_MMC_DW_IDMAC=y

CONFIG_MMC_DW_PLTFM=y

CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_DW_DMAC=y

CONFIG_PL330_DMA=y

CONFIG_PWM=y

CONFIG_PHY_HIX5HD2_SATA=y

CONFIG_EXT4_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y
@@ -65,6 +82,8 @@ CONFIG_NFS_V4=y 
CONFIG_ROOT_NFS=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_VFP=y

arch/arm/configs/imx_v6_v7_defconfig

+9 −1
Original line number Diff line number Diff line
@@ -163,7 +163,13 @@ CONFIG_SPI_IMX=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MC9S08DZ60=y

CONFIG_GPIO_STMPE=y

# CONFIG_HWMON is not set

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_IMX_THERMAL=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_IMX=y

CONFIG_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_DA9052_I2C=y
@@ -211,6 +217,7 @@ CONFIG_SND_SOC_IMX_WM8962=y 
CONFIG_SND_SOC_IMX_SGTL5000=y

CONFIG_SND_SOC_IMX_SPDIF=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_SND_SOC_TLV320AIC3X=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y
@@ -239,6 +246,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y 
CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_ISL1208=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_MC13XXX=y