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

Commit 7477838f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'defconfig-for-3.16' of... 

Merge tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next

Pull ARM SoC defconfig updates from Olof Johansson:
 "A number of defconfig updates for 3.16.  We have quite a few of these
  as new SoCs and drivers get supported, and we've started collecting
  them in one shared branch.

  We started halfway through the merge window so there'll be some small
  conflicts with other branches on nearby changes, but nothing major.
  Next cycle should be smoother"

* tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: Enable Exynos platform
  ARM: configs: update Allwinner options
  ARM: qcom: Enable GSBI driver in defconfig
  ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
  ARM: at91/defconfig: sama5_defconfig: updated
  ARM: add drivers for Colibri T30 to multi_v7_defconfig
  ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
  ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
  ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
  ARM: sunxi: Add A31 reset driver to sunxi_defconfig
  ARM: config: Update msm_defconfig
  ARM: mvebu: enable MSI support in mvebu_v7_defconfig
  ARM: config: Add qcom_defconfig
  ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig
parents c67d9ce1 c6ac4487

arch/arm/configs/msm_defconfig

+3 −22
Original line number Diff line number Diff line
@@ -17,21 +17,14 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM_DT=y

CONFIG_ARCH_MSM8X60=y

CONFIG_ARCH_MSM8960=y

CONFIG_ARCH_MSM8974=y

CONFIG_SMP=y

CONFIG_ARCH_MSM=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_HIGHPTE=y

CONFIG_CLEANCACHE=y

CONFIG_CC_STACKPROTECTOR=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_AUTO_ZRELADDR=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y
@@ -79,16 +72,12 @@ CONFIG_SERIO_LIBPS2=y 
# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM=y

CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_MSM=y

CONFIG_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y
@@ -100,25 +89,17 @@ CONFIG_SND_DYNAMIC_MINORS=y 
# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_HID_BATTERY_STRENGTH=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MSM=y

CONFIG_USB_ACM=y

CONFIG_USB_SERIAL=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_NEW_LEDS=y

CONFIG_RTC_CLASS=y

CONFIG_STAGING=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_MSM_GCC_8660=y

CONFIG_MSM_MMCC_8960=y

CONFIG_MSM_MMCC_8974=y

CONFIG_MSM_IOMMU=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm/configs/multi_v7_defconfig

+33 −6
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ CONFIG_NO_HZ=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_MVEBU=y

CONFIG_MACH_ARMADA_370=y

CONFIG_MACH_ARMADA_375=y
@@ -15,13 +17,12 @@ CONFIG_MACH_ARMADA_38X=y 
CONFIG_MACH_ARMADA_XP=y

CONFIG_MACH_DOVE=y

CONFIG_ARCH_BCM=y

CONFIG_ARCH_BCM_5301X=y

CONFIG_ARCH_BCM_MOBILE=y

CONFIG_ARCH_BCM_5301X=y

CONFIG_ARCH_BERLIN=y

CONFIG_MACH_BERLIN_BG2=y

CONFIG_MACH_BERLIN_BG2CD=y

CONFIG_MACH_BERLIN_BG2Q=y

CONFIG_GPIO_PCA953X=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_HI3xxx=y

CONFIG_ARCH_KEYSTONE=y
@@ -35,8 +36,8 @@ CONFIG_ARCH_OMAP3=y 
CONFIG_ARCH_OMAP4=y

CONFIG_SOC_OMAP5=y

CONFIG_SOC_AM33XX=y

CONFIG_SOC_DRA7XX=y

CONFIG_SOC_AM43XX=y

CONFIG_SOC_DRA7XX=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8X60=y

CONFIG_ARCH_MSM8960=y
@@ -48,6 +49,7 @@ CONFIG_ARCH_SPEAR13XX=y 
CONFIG_MACH_SPEAR1310=y

CONFIG_MACH_SPEAR1340=y

CONFIG_ARCH_STI=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_SUNXI=y

CONFIG_ARCH_SIRF=y

CONFIG_ARCH_TEGRA=y
@@ -62,7 +64,6 @@ CONFIG_MACH_SNOWBALL=y 
CONFIG_MACH_UX500_DT=y

CONFIG_ARCH_VEXPRESS=y

CONFIG_ARCH_VEXPRESS_CA9X4=y

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_WM8850=y

CONFIG_ARCH_ZYNQ=y

CONFIG_NEON=y
@@ -72,6 +73,7 @@ CONFIG_PCI_MSI=y 
CONFIG_PCI_MVEBU=y

CONFIG_PCI_TEGRA=y

CONFIG_SMP=y

CONFIG_NR_CPUS=8

CONFIG_HIGHPTE=y

CONFIG_CMA=y

CONFIG_ARM_APPENDED_DTB=y
@@ -119,15 +121,18 @@ CONFIG_ICS932S401=y 
CONFIG_APDS9802ALS=y

CONFIG_ISL29003=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_SUNXI_SID=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_SUNXI=y

CONFIG_SATA_HIGHBANK=y

CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_SUN4I_EMAC=y

CONFIG_MACB=y

CONFIG_NET_CALXEDA_XGMAC=y

CONFIG_MV643XX_ETH=y

CONFIG_MVNETA=y
@@ -160,6 +165,8 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_SERIAL_SIRFSOC=y

CONFIG_SERIAL_SIRFSOC_CONSOLE=y

CONFIG_SERIAL_TEGRA=y
@@ -182,7 +189,9 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_MUX_PINCTRL=y

CONFIG_I2C_CADENCE=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_EXYNOS5=y

CONFIG_I2C_MV64XXX=y

CONFIG_I2C_SIRF=y

CONFIG_I2C_TEGRA=y
@@ -191,6 +200,8 @@ CONFIG_SPI_OMAP24XX=y 
CONFIG_SPI_ORION=y

CONFIG_SPI_PL022=y

CONFIG_SPI_SIRF=y

CONFIG_SPI_SUN4I=y

CONFIG_SPI_SUN6I=y

CONFIG_SPI_TEGRA114=y

CONFIG_SPI_TEGRA20_SFLASH=y

CONFIG_SPI_TEGRA20_SLINK=y
@@ -199,6 +210,7 @@ CONFIG_PINCTRL_PALMAS=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_GENERIC_PLATFORM=y

CONFIG_GPIO_DWAPB=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCA953X_IRQ=y

CONFIG_GPIO_TWL4030=y

CONFIG_GPIO_PALMAS=y
@@ -208,16 +220,19 @@ CONFIG_BATTERY_SBS=y 
CONFIG_CHARGER_TPS65090=y

CONFIG_POWER_RESET_AS3722=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_POWER_RESET_SUN6I=y

CONFIG_SENSORS_LM90=y

CONFIG_THERMAL=y

CONFIG_DOVE_THERMAL=y

CONFIG_ARMADA_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_ORION_WATCHDOG=y

CONFIG_SUNXI_WATCHDOG=y

CONFIG_MFD_AS3722=y

CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_SPI=y

CONFIG_MFD_MAX8907=y

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_PALMAS=y

CONFIG_MFD_TPS65090=y

CONFIG_MFD_TPS6586X=y
@@ -228,6 +243,8 @@ CONFIG_REGULATOR_AS3722=y 
CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_MAX8907=y

CONFIG_REGULATOR_PALMAS=y

CONFIG_REGULATOR_S2MPS11=y

CONFIG_REGULATOR_S5M8767=y

CONFIG_REGULATOR_TPS51632=y

CONFIG_REGULATOR_TPS62360=y

CONFIG_REGULATOR_TPS65090=y
@@ -267,6 +284,8 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_TEGRA=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_ISP1760_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y
@@ -281,15 +300,21 @@ CONFIG_MMC=y 
CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_OF_ARASAN=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y

CONFIG_MMC_SDHCI_PXAV3=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_DOVE=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_PXAV3=y

CONFIG_MMC_SDHCI_SPEAR=y

CONFIG_MMC_SDHCI_S3C=y

CONFIG_MMC_SDHCI_S3C_DMA=y

CONFIG_MMC_SDHCI_BCM_KONA=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_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_HIGHBANK_MC=y
@@ -305,6 +330,7 @@ CONFIG_RTC_DRV_TPS65910=y 
CONFIG_RTC_DRV_EM3027=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_VT8500=y

CONFIG_RTC_DRV_SUNXI=y

CONFIG_RTC_DRV_MV=y

CONFIG_RTC_DRV_TEGRA=y

CONFIG_DMADEVICES=y
@@ -339,6 +365,7 @@ CONFIG_PWM=y 
CONFIG_PWM_TEGRA=y

CONFIG_PWM_VT8500=y

CONFIG_OMAP_USB2=y

CONFIG_PHY_SUN4I_USB=y

CONFIG_EXT4_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm/configs/mvebu_v7_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ CONFIG_NEON=y 
# CONFIG_CACHE_L2X0 is not set

# CONFIG_SWP_EMULATE is not set

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCI_MVEBU=y

CONFIG_SMP=y

CONFIG_AEABI=y
@@ -84,6 +85,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_ROOT_HUB_TT=y

CONFIG_USB_STORAGE=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_MVEBU=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI_PXAV3=y

CONFIG_MMC_MVSDIO=y

arch/arm/configs/qcom_defconfig

0 → 100644
+165 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8X60=y

CONFIG_ARCH_MSM8960=y

CONFIG_ARCH_MSM8974=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_HIGHPTE=y

CONFIG_CLEANCACHE=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_CFG80211=y

CONFIG_RFKILL=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_M25P80=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

CONFIG_SCSI_TGT=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_CHR_DEV_SCH=y

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_MDIO_BITBANG=y

CONFIG_MDIO_GPIO=y

CONFIG_SLIP=y

CONFIG_SLIP_COMPRESSED=y

CONFIG_SLIP_MODE_SLIP6=y

CONFIG_USB_USBNET=y

# CONFIG_USB_NET_AX8817X is not set

# CONFIG_USB_NET_ZAURUS is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_MOUSE_PS2 is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM=y

CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_QUP=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPMI=y

CONFIG_PINCTRL_APQ8064=y

CONFIG_PINCTRL_IPQ8064=y

CONFIG_PINCTRL_MSM8X74=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_MSM=y

CONFIG_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_FB=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_HID_BATTERY_STRENGTH=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_ACM=y

CONFIG_USB_SERIAL=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_BAM_DMA=y

CONFIG_STAGING=y

CONFIG_QCOM_GSBI=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_MSM_GCC_8660=y

CONFIG_MSM_MMCC_8960=y

CONFIG_MSM_MMCC_8974=y

CONFIG_MSM_IOMMU=y

CONFIG_GENERIC_PHY=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_FUSE_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_CIFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_LOCKUP_DETECTOR=y

# CONFIG_DETECT_HUNG_TASK is not set

# CONFIG_SCHED_DEBUG is not set

CONFIG_TIMER_STATS=y

arch/arm/configs/sama5_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ CONFIG_SPI_GPIO=y 
CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_SSB=m

CONFIG_REGULATOR=y

CONFIG_REGULATOR_ACT8865=y

CONFIG_FB=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set