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

Commit 03a40e29 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 Olof Johansson:
 "Most of these changes are to enable new drivers that have been merged,
  or various additions to make defconfigs more useful.  There's also a
  set of patches trimming down omap2plus kernel size a bit since it is
  quite large"

* tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: config: add DEVTMPFS option by default to keystone config
  ARM: multi_v7_defconfig: Enable Exynos5420 Multi-Cluster PM support
  ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again
  ARM: exynos_defconfig: Enable CONFIG_FHANDLE
  ARM: exynos_defconfig: Enable PMIC and MUIC drivers for Gears and Trats2
  ARM: exynos_defconfig: Enable CONFIG_LOCKUP_DETECTOR
  ARM: config: enable ARCH_HIP01
  ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support
  ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform
  ARM: imx_v6_v7_defconfig: enable more USB functions
  ARM: imx_v6_v7_defconfig: Select CONFIG_FB_MXS
  ARM: omap2plus_defconfig: Enable pcf857x
  ARM: omap2plus_defconfig: Add NOR flash support
  ARM: omap2plus_defconfig: Enable support for davinci_emac
  ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY
  ARM: efm32: update defconfig
  ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
  ARM: multi_v7_defconfig: Enable Hip01 platform
  ARM: config: multi_v7: Update it for Keystone defconfig
  ARM: shmobile: Enable kzm9g board in multiplatform defconfig
  ...
parents 18656782 0f01f958

arch/arm/configs/efm32_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ CONFIG_EMBEDDED=y 
# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_ARCH_EFM32=y

# CONFIG_KUSER_HELPERS is not set

CONFIG_SET_MEM_PARAM=y

CONFIG_DRAM_BASE=0x88000000

CONFIG_DRAM_SIZE=0x00400000
@@ -49,7 +48,6 @@ CONFIG_MTD=y 
CONFIG_MTD_BLOCK_RO=y

CONFIG_MTD_ROM=y

CONFIG_MTD_UCLINUX=y

CONFIG_PROC_DEVICETREE=y

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set
@@ -78,6 +76,9 @@ CONFIG_SERIAL_NONSTANDARD=y 
CONFIG_SERIAL_EFM32_UART=y

CONFIG_SERIAL_EFM32_UART_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_EFM32=y

CONFIG_SPI=y

CONFIG_SPI_EFM32=y

CONFIG_GPIO_SYSFS=y

arch/arm/configs/exynos_defconfig

+11 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y
@@ -83,6 +84,10 @@ CONFIG_I2C_S3C2410=y 
CONFIG_DEBUG_GPIO=y

CONFIG_POWER_SUPPLY=y

CONFIG_BATTERY_SBS=y

CONFIG_BATTERY_MAX17040=y

CONFIG_BATTERY_MAX17042=y

CONFIG_CHARGER_MAX14577=y

CONFIG_CHARGER_MAX77693=y

CONFIG_CHARGER_TPS65090=y

CONFIG_HWMON=y

CONFIG_SENSORS_LM90=y
@@ -94,6 +99,7 @@ CONFIG_S3C2410_WATCHDOG=y 
CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_I2C=y

CONFIG_MFD_CROS_EC_SPI=y

CONFIG_MFD_MAX14577=y

CONFIG_MFD_MAX77686=y

CONFIG_MFD_MAX77693=y

CONFIG_MFD_MAX8997=y
@@ -102,6 +108,7 @@ CONFIG_MFD_TPS65090=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_MAX14577=y

CONFIG_REGULATOR_MAX8997=y

CONFIG_REGULATOR_MAX77686=y

CONFIG_REGULATOR_MAX77802=y
@@ -168,6 +175,9 @@ 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

CONFIG_IIO=y

CONFIG_EXYNOS_ADC=y

CONFIG_PWM=y
@@ -198,6 +208,7 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_SHA256=y

arch/arm/configs/hisi_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_ARCH_HI3xxx=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_ARCH_HIX5HD2=y

CONFIG_ARCH_HIP01=y

CONFIG_ARCH_HIP04=y

CONFIG_SMP=y

CONFIG_NR_CPUS=16

arch/arm/configs/imx_v6_v7_defconfig

+35 −4
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_MTD_NAND=y 
CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_SPI_NOR=y

CONFIG_SPI_FSL_QUADSPI=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -129,6 +130,11 @@ CONFIG_SMC911X=y 
CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_AT803X_PHY=y

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m

CONFIG_USB_USBNET=m

CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y
@@ -163,13 +169,14 @@ CONFIG_SPI_IMX=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MC9S08DZ60=y

CONFIG_GPIO_STMPE=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_IMX=y

CONFIG_POWER_RESET_SYSCON=y

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
@@ -189,6 +196,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_RC_SUPPORT=y

CONFIG_RC_DEVICES=y

CONFIG_IR_GPIO_CIR=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_VIDEO_MX3=y
@@ -198,16 +207,17 @@ CONFIG_SOC_CAMERA_OV2640=y 
CONFIG_IMX_IPUV3_CORE=y

CONFIG_DRM=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_LCD_PLATFORM=y

CONFIG_FB_MXS=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_BACKLIGHT_GPIO=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=y

CONFIG_SND_SOC_FSL_SAI=y

CONFIG_SND_IMX_SOC=y
@@ -226,11 +236,32 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_FTDI_SIO=m

CONFIG_USB_SERIAL_OPTION=m

CONFIG_USB_EHSET_TEST_FIXTURE=m

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_CONFIGFS=m

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ACM=y

CONFIG_USB_CONFIGFS_OBEX=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_ECM=y

CONFIG_USB_CONFIGFS_ECM_SUBSET=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_EEM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_LB_SS=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_ZERO=m

CONFIG_USB_ETH=m

CONFIG_USB_G_NCM=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

arch/arm/configs/keystone_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -201,3 +201,4 @@ CONFIG_KEYSTONE_IRQ=y 
CONFIG_GPIO_SYSCON=y

CONFIG_TI_DAVINCI_MDIO=y

CONFIG_MARVELL_PHY=y

CONFIG_DEVTMPFS=y