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

Commit 2144de82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
  ...
parents e5ac320d b50c9c2d

arch/arm/configs/exynos_defconfig

+18 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_PM=y
@@ -34,6 +36,14 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_WIRELESS=y

CONFIG_CFG80211=y

CONFIG_MWIFIEX=y

CONFIG_MWIFIEX_SDIO=y

CONFIG_RFKILL_REGULATOR=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y
@@ -91,9 +101,11 @@ CONFIG_CHARGER_MAX77693=y 
CONFIG_CHARGER_TPS65090=y

CONFIG_HWMON=y

CONFIG_SENSORS_LM90=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_THERMAL=y

CONFIG_THERMAL=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_EXYNOS_THERMAL_CORE=y

CONFIG_THERMAL_EMULATION=y

CONFIG_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=y

CONFIG_MFD_CROS_EC=y
@@ -118,6 +130,7 @@ CONFIG_REGULATOR_S2MPS11=y 
CONFIG_REGULATOR_S5M8767=y

CONFIG_REGULATOR_TPS65090=y

CONFIG_DRM=y

CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_BRIDGE=y

CONFIG_DRM_PTN3460=y

CONFIG_DRM_PS8622=y
@@ -171,10 +184,11 @@ CONFIG_RTC_DRV_S5M=y 
CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

CONFIG_CHROME_PLATFORMS=y

CONFIG_CROS_EC_CHARDEV=y

CONFIG_COMMON_CLK_MAX77686=y

CONFIG_COMMON_CLK_MAX77802=y

CONFIG_COMMON_CLK_S2MPS11=y

CONFIG_EXYNOS_IOMMU=y

CONFIG_EXTCON=y

CONFIG_EXTCON_MAX14577=y

CONFIG_EXTCON_MAX77693=y
@@ -197,6 +211,8 @@ CONFIG_TMPFS=y 
CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ CONFIG_EXT2_FS=y 
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

arch/arm/configs/imx_v6_v7_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ CONFIG_IPV6=y 
CONFIG_NETFILTER=y

CONFIG_CAN=y

CONFIG_CAN_FLEXCAN=y

CONFIG_BT=y

CONFIG_BT_HCIUART=y

CONFIG_BT_HCIUART_3WIRE=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_RFKILL=y
@@ -168,6 +171,7 @@ CONFIG_SPI=y 
CONFIG_SPI_IMX=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MC9S08DZ60=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_STMPE=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

arch/arm/configs/multi_v7_defconfig

+13 −1
Original line number Diff line number Diff line
@@ -12,10 +12,12 @@ CONFIG_MODULE_UNLOAD=y 
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 @@ CONFIG_ARCH_WM8850=y 
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
@@ -133,6 +136,9 @@ CONFIG_CAN_BCM=y 
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 @@ CONFIG_USB_NET_SMSC95XX=y 
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 @@ CONFIG_KEYBOARD_SPEAR=y 
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 @@ CONFIG_BATTERY_SBS=y 
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 @@ CONFIG_DW_DMAC=y 
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 @@ CONFIG_MSM_MMCC_8960=y 
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 @@ CONFIG_PHY_MIPHY365X=y 
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

arch/arm/configs/mvebu_v7_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -12,6 +13,7 @@ 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_PCI=y