Skip to content

Commit 03a40e2

Browse files
torvaldstorvalds
committed
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 ...
2 parents 1865678 + 0f01f95 commit 03a40e2

13 files changed

+203
-73
lines changed

‎arch/arm/configs/efm32_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONFIG_EMBEDDED=y
1717
# CONFIG_IOSCHED_CFQ is not set
1818
# CONFIG_MMU is not set
1919
CONFIG_ARCH_EFM32=y
20-
# CONFIG_KUSER_HELPERS is not set
2120
CONFIG_SET_MEM_PARAM=y
2221
CONFIG_DRAM_BASE=0x88000000
2322
CONFIG_DRAM_SIZE=0x00400000
@@ -49,7 +48,6 @@ CONFIG_MTD=y
4948
CONFIG_MTD_BLOCK_RO=y
5049
CONFIG_MTD_ROM=y
5150
CONFIG_MTD_UCLINUX=y
52-
CONFIG_PROC_DEVICETREE=y
5351
# CONFIG_BLK_DEV is not set
5452
CONFIG_NETDEVICES=y
5553
# CONFIG_NET_VENDOR_ARC is not set
@@ -78,6 +76,9 @@ CONFIG_SERIAL_NONSTANDARD=y
7876
CONFIG_SERIAL_EFM32_UART=y
7977
CONFIG_SERIAL_EFM32_UART_CONSOLE=y
8078
# CONFIG_HW_RANDOM is not set
79+
CONFIG_I2C=y
80+
# CONFIG_I2C_COMPAT is not set
81+
CONFIG_I2C_EFM32=y
8182
CONFIG_SPI=y
8283
CONFIG_SPI_EFM32=y
8384
CONFIG_GPIO_SYSFS=y

‎arch/arm/configs/exynos_defconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CONFIG_SYSVIPC=y
2+
CONFIG_FHANDLE=y
23
CONFIG_NO_HZ=y
34
CONFIG_HIGH_RES_TIMERS=y
45
CONFIG_CGROUPS=y
@@ -83,6 +84,10 @@ CONFIG_I2C_S3C2410=y
8384
CONFIG_DEBUG_GPIO=y
8485
CONFIG_POWER_SUPPLY=y
8586
CONFIG_BATTERY_SBS=y
87+
CONFIG_BATTERY_MAX17040=y
88+
CONFIG_BATTERY_MAX17042=y
89+
CONFIG_CHARGER_MAX14577=y
90+
CONFIG_CHARGER_MAX77693=y
8691
CONFIG_CHARGER_TPS65090=y
8792
CONFIG_HWMON=y
8893
CONFIG_SENSORS_LM90=y
@@ -94,6 +99,7 @@ CONFIG_S3C2410_WATCHDOG=y
9499
CONFIG_MFD_CROS_EC=y
95100
CONFIG_MFD_CROS_EC_I2C=y
96101
CONFIG_MFD_CROS_EC_SPI=y
102+
CONFIG_MFD_MAX14577=y
97103
CONFIG_MFD_MAX77686=y
98104
CONFIG_MFD_MAX77693=y
99105
CONFIG_MFD_MAX8997=y
@@ -102,6 +108,7 @@ CONFIG_MFD_TPS65090=y
102108
CONFIG_REGULATOR=y
103109
CONFIG_REGULATOR_FIXED_VOLTAGE=y
104110
CONFIG_REGULATOR_GPIO=y
111+
CONFIG_REGULATOR_MAX14577=y
105112
CONFIG_REGULATOR_MAX8997=y
106113
CONFIG_REGULATOR_MAX77686=y
107114
CONFIG_REGULATOR_MAX77802=y
@@ -168,6 +175,9 @@ CONFIG_COMMON_CLK_MAX77686=y
168175
CONFIG_COMMON_CLK_MAX77802=y
169176
CONFIG_COMMON_CLK_S2MPS11=y
170177
CONFIG_EXYNOS_IOMMU=y
178+
CONFIG_EXTCON=y
179+
CONFIG_EXTCON_MAX14577=y
180+
CONFIG_EXTCON_MAX77693=y
171181
CONFIG_IIO=y
172182
CONFIG_EXYNOS_ADC=y
173183
CONFIG_PWM=y
@@ -198,6 +208,7 @@ CONFIG_DETECT_HUNG_TASK=y
198208
CONFIG_DEBUG_RT_MUTEXES=y
199209
CONFIG_DEBUG_SPINLOCK=y
200210
CONFIG_DEBUG_MUTEXES=y
211+
CONFIG_LOCKUP_DETECTOR=y
201212
CONFIG_DEBUG_INFO=y
202213
CONFIG_DEBUG_USER=y
203214
CONFIG_CRYPTO_SHA256=y

‎arch/arm/configs/hisi_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CONFIG_ARCH_HI3xxx=y
88
CONFIG_PARTITION_ADVANCED=y
99
CONFIG_CMDLINE_PARTITION=y
1010
CONFIG_ARCH_HIX5HD2=y
11+
CONFIG_ARCH_HIP01=y
1112
CONFIG_ARCH_HIP04=y
1213
CONFIG_SMP=y
1314
CONFIG_NR_CPUS=16

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ CONFIG_MTD_NAND=y
9797
CONFIG_MTD_NAND_GPMI_NAND=y
9898
CONFIG_MTD_NAND_MXC=y
9999
CONFIG_MTD_SPI_NOR=y
100+
CONFIG_SPI_FSL_QUADSPI=y
100101
CONFIG_MTD_UBI=y
101102
CONFIG_BLK_DEV_LOOP=y
102103
CONFIG_BLK_DEV_RAM=y
@@ -129,6 +130,11 @@ CONFIG_SMC911X=y
129130
CONFIG_SMSC911X=y
130131
# CONFIG_NET_VENDOR_STMICRO is not set
131132
CONFIG_AT803X_PHY=y
133+
CONFIG_USB_PEGASUS=m
134+
CONFIG_USB_RTL8150=m
135+
CONFIG_USB_RTL8152=m
136+
CONFIG_USB_USBNET=m
137+
CONFIG_USB_NET_CDC_EEM=m
132138
CONFIG_BRCMFMAC=m
133139
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
134140
CONFIG_INPUT_EVDEV=y
@@ -163,13 +169,14 @@ CONFIG_SPI_IMX=y
163169
CONFIG_GPIO_SYSFS=y
164170
CONFIG_GPIO_MC9S08DZ60=y
165171
CONFIG_GPIO_STMPE=y
172+
CONFIG_POWER_SUPPLY=y
173+
CONFIG_POWER_RESET=y
174+
CONFIG_POWER_RESET_IMX=y
175+
CONFIG_POWER_RESET_SYSCON=y
166176
CONFIG_SENSORS_GPIO_FAN=y
167177
CONFIG_THERMAL=y
168178
CONFIG_CPU_THERMAL=y
169179
CONFIG_IMX_THERMAL=y
170-
CONFIG_POWER_SUPPLY=y
171-
CONFIG_POWER_RESET=y
172-
CONFIG_POWER_RESET_IMX=y
173180
CONFIG_WATCHDOG=y
174181
CONFIG_IMX2_WDT=y
175182
CONFIG_MFD_DA9052_I2C=y
@@ -189,6 +196,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
189196
CONFIG_MEDIA_RC_SUPPORT=y
190197
CONFIG_RC_DEVICES=y
191198
CONFIG_IR_GPIO_CIR=y
199+
CONFIG_MEDIA_USB_SUPPORT=y
200+
CONFIG_USB_VIDEO_CLASS=m
192201
CONFIG_V4L_PLATFORM_DRIVERS=y
193202
CONFIG_SOC_CAMERA=y
194203
CONFIG_VIDEO_MX3=y
@@ -198,16 +207,17 @@ CONFIG_SOC_CAMERA_OV2640=y
198207
CONFIG_IMX_IPUV3_CORE=y
199208
CONFIG_DRM=y
200209
CONFIG_DRM_PANEL_SIMPLE=y
201-
CONFIG_BACKLIGHT_LCD_SUPPORT=y
202210
CONFIG_LCD_CLASS_DEVICE=y
203211
CONFIG_LCD_L4F00242T03=y
204212
CONFIG_LCD_PLATFORM=y
213+
CONFIG_FB_MXS=y
205214
CONFIG_BACKLIGHT_PWM=y
206215
CONFIG_BACKLIGHT_GPIO=y
207216
CONFIG_FRAMEBUFFER_CONSOLE=y
208217
CONFIG_LOGO=y
209218
CONFIG_SOUND=y
210219
CONFIG_SND=y
220+
CONFIG_SND_USB_AUDIO=m
211221
CONFIG_SND_SOC=y
212222
CONFIG_SND_SOC_FSL_SAI=y
213223
CONFIG_SND_IMX_SOC=y
@@ -226,11 +236,32 @@ CONFIG_USB_STORAGE=y
226236
CONFIG_USB_CHIPIDEA=y
227237
CONFIG_USB_CHIPIDEA_UDC=y
228238
CONFIG_USB_CHIPIDEA_HOST=y
239+
CONFIG_USB_SERIAL=m
240+
CONFIG_USB_SERIAL_GENERIC=y
241+
CONFIG_USB_SERIAL_FTDI_SIO=m
242+
CONFIG_USB_SERIAL_OPTION=m
243+
CONFIG_USB_EHSET_TEST_FIXTURE=m
229244
CONFIG_NOP_USB_XCEIV=y
230245
CONFIG_USB_MXS_PHY=y
231246
CONFIG_USB_GADGET=y
247+
CONFIG_USB_CONFIGFS=m
248+
CONFIG_USB_CONFIGFS_SERIAL=y
249+
CONFIG_USB_CONFIGFS_ACM=y
250+
CONFIG_USB_CONFIGFS_OBEX=y
251+
CONFIG_USB_CONFIGFS_NCM=y
252+
CONFIG_USB_CONFIGFS_ECM=y
253+
CONFIG_USB_CONFIGFS_ECM_SUBSET=y
254+
CONFIG_USB_CONFIGFS_RNDIS=y
255+
CONFIG_USB_CONFIGFS_EEM=y
256+
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
257+
CONFIG_USB_CONFIGFS_F_LB_SS=y
258+
CONFIG_USB_CONFIGFS_F_FS=y
259+
CONFIG_USB_ZERO=m
232260
CONFIG_USB_ETH=m
261+
CONFIG_USB_G_NCM=m
262+
CONFIG_USB_GADGETFS=m
233263
CONFIG_USB_MASS_STORAGE=m
264+
CONFIG_USB_G_SERIAL=m
234265
CONFIG_MMC=y
235266
CONFIG_MMC_SDHCI=y
236267
CONFIG_MMC_SDHCI_PLTFM=y

‎arch/arm/configs/keystone_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,4 @@ CONFIG_KEYSTONE_IRQ=y
201201
CONFIG_GPIO_SYSCON=y
202202
CONFIG_TI_DAVINCI_MDIO=y
203203
CONFIG_MARVELL_PHY=y
204+
CONFIG_DEVTMPFS=y

‎arch/arm/configs/kzm9g_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ CONFIG_DMADEVICES=y
126126
CONFIG_SH_DMAE=y
127127
CONFIG_ASYNC_TX_DMA=y
128128
CONFIG_STAGING=y
129-
CONFIG_SENSORS_AK8975=y
130129
CONFIG_IIO=y
130+
CONFIG_AK8975=y
131131
# CONFIG_DNOTIFY is not set
132132
CONFIG_VFAT_FS=y
133133
CONFIG_TMPFS=y

‎arch/arm/configs/multi_v7_defconfig

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CONFIG_ARCH_HIGHBANK=y
3232
CONFIG_ARCH_HISI=y
3333
CONFIG_ARCH_HI3xxx=y
3434
CONFIG_ARCH_HIX5HD2=y
35+
CONFIG_ARCH_HIP01=y
3536
CONFIG_ARCH_HIP04=y
3637
CONFIG_ARCH_KEYSTONE=y
3738
CONFIG_ARCH_MESON=y
@@ -60,6 +61,7 @@ CONFIG_MACH_SPEAR1310=y
6061
CONFIG_MACH_SPEAR1340=y
6162
CONFIG_ARCH_STI=y
6263
CONFIG_ARCH_EXYNOS=y
64+
CONFIG_EXYNOS5420_MCPM=y
6365
CONFIG_ARCH_SUNXI=y
6466
CONFIG_ARCH_SIRF=y
6567
CONFIG_ARCH_TEGRA=y
@@ -78,6 +80,7 @@ CONFIG_ARCH_WM8850=y
7880
CONFIG_ARCH_ZYNQ=y
7981
CONFIG_TRUSTED_FOUNDATIONS=y
8082
CONFIG_PCI=y
83+
CONFIG_PCI_KEYSTONE=y
8184
CONFIG_PCI_MSI=y
8285
CONFIG_PCI_MVEBU=y
8386
CONFIG_PCI_TEGRA=y
@@ -132,6 +135,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
132135
CONFIG_MTD_BLOCK=y
133136
CONFIG_MTD_M25P80=y
134137
CONFIG_MTD_NAND=y
138+
CONFIG_MTD_NAND_DAVINCI=y
135139
CONFIG_MTD_SPI_NOR=y
136140
CONFIG_MTD_UBI=y
137141
CONFIG_BLK_DEV_LOOP=y
@@ -189,12 +193,15 @@ CONFIG_MOUSE_PS2_ELANTECH=y
189193
CONFIG_INPUT_TOUCHSCREEN=y
190194
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
191195
CONFIG_TOUCHSCREEN_STMPE=y
196+
CONFIG_TOUCHSCREEN_SUN4I=y
192197
CONFIG_INPUT_MISC=y
193198
CONFIG_INPUT_MPU3050=y
199+
CONFIG_INPUT_AXP20X_PEK=y
194200
CONFIG_SERIO_AMBAKMI=y
195201
CONFIG_SERIAL_8250=y
196202
CONFIG_SERIAL_8250_CONSOLE=y
197203
CONFIG_SERIAL_8250_DW=y
204+
CONFIG_SERIAL_8250_MT6577=y
198205
CONFIG_SERIAL_AMBA_PL011=y
199206
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
200207
CONFIG_SERIAL_MESON=y
@@ -220,6 +227,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
220227
CONFIG_SERIAL_ST_ASC=y
221228
CONFIG_SERIAL_ST_ASC_CONSOLE=y
222229
CONFIG_I2C_CHARDEV=y
230+
CONFIG_I2C_DAVINCI=y
223231
CONFIG_I2C_MUX=y
224232
CONFIG_I2C_MUX_PCA954x=y
225233
CONFIG_I2C_MUX_PINCTRL=y
@@ -233,6 +241,7 @@ CONFIG_I2C_TEGRA=y
233241
CONFIG_I2C_ST=y
234242
CONFIG_SPI=y
235243
CONFIG_I2C_XILINX=y
244+
CONFIG_SPI_DAVINCI=y
236245
CONFIG_SPI_CADENCE=y
237246
CONFIG_SPI_OMAP24XX=y
238247
CONFIG_SPI_ORION=y
@@ -251,23 +260,28 @@ CONFIG_PINCTRL_APQ8084=y
251260
CONFIG_GPIO_SYSFS=y
252261
CONFIG_GPIO_GENERIC_PLATFORM=y
253262
CONFIG_GPIO_DWAPB=y
263+
CONFIG_GPIO_DAVINCI=y
254264
CONFIG_GPIO_XILINX=y
255265
CONFIG_GPIO_ZYNQ=y
256266
CONFIG_GPIO_PCA953X=y
257267
CONFIG_GPIO_PCA953X_IRQ=y
258268
CONFIG_GPIO_TWL4030=y
259269
CONFIG_GPIO_PALMAS=y
270+
CONFIG_GPIO_SYSCON=y
260271
CONFIG_GPIO_TPS6586X=y
261272
CONFIG_GPIO_TPS65910=y
262273
CONFIG_BATTERY_SBS=y
263274
CONFIG_CHARGER_TPS65090=y
264275
CONFIG_POWER_RESET_AS3722=y
265276
CONFIG_POWER_RESET_GPIO=y
277+
CONFIG_POWER_RESET_KEYSTONE=y
266278
CONFIG_POWER_RESET_SUN6I=y
267279
CONFIG_SENSORS_LM90=y
268280
CONFIG_SENSORS_LM95245=y
269281
CONFIG_THERMAL=y
282+
CONFIG_CPU_THERMAL=y
270283
CONFIG_ARMADA_THERMAL=y
284+
CONFIG_DAVINCI_WATCHDOG
271285
CONFIG_ST_THERMAL_SYSCFG=y
272286
CONFIG_ST_THERMAL_MEMMAP=y
273287
CONFIG_WATCHDOG=y
@@ -278,6 +292,7 @@ CONFIG_SUNXI_WATCHDOG=y
278292
CONFIG_MESON_WATCHDOG=y
279293
CONFIG_MFD_AS3722=y
280294
CONFIG_MFD_BCM590XX=y
295+
CONFIG_MFD_AXP20X=y
281296
CONFIG_MFD_CROS_EC=y
282297
CONFIG_MFD_CROS_EC_SPI=y
283298
CONFIG_MFD_MAX77686=y
@@ -290,6 +305,7 @@ CONFIG_MFD_TPS6586X=y
290305
CONFIG_MFD_TPS65910=y
291306
CONFIG_REGULATOR_AB8500=y
292307
CONFIG_REGULATOR_AS3722=y
308+
CONFIG_REGULATOR_AXP20X=y
293309
CONFIG_REGULATOR_BCM590XX=y
294310
CONFIG_REGULATOR_GPIO=y
295311
CONFIG_MFD_SYSCON=y
@@ -347,9 +363,11 @@ CONFIG_USB_OHCI_HCD=y
347363
CONFIG_USB_OHCI_HCD_STI=y
348364
CONFIG_USB_OHCI_HCD_PLATFORM=y
349365
CONFIG_USB_STORAGE=y
366+
CONFIG_USB_DWC3=y
350367
CONFIG_USB_CHIPIDEA=y
351368
CONFIG_USB_CHIPIDEA_HOST=y
352369
CONFIG_AB8500_USB=y
370+
CONFIG_KEYSTONE_USB_PHY=y
353371
CONFIG_OMAP_USB3=y
354372
CONFIG_SAMSUNG_USB2PHY=y
355373
CONFIG_SAMSUNG_USB3PHY=y
@@ -445,6 +463,7 @@ CONFIG_MSM_MMCC_8974=y
445463
CONFIG_TEGRA_IOMMU_GART=y
446464
CONFIG_TEGRA_IOMMU_SMMU=y
447465
CONFIG_MEMORY=y
466+
CONFIG_TI_AEMIF=y
448467
CONFIG_IIO=y
449468
CONFIG_XILINX_XADC=y
450469
CONFIG_AK8975=y
@@ -454,6 +473,7 @@ CONFIG_PWM_VT8500=y
454473
CONFIG_PHY_HIX5HD2_SATA=y
455474
CONFIG_OMAP_USB2=y
456475
CONFIG_TI_PIPE3=y
476+
CONFIG_PHY_MIPHY28LP=y
457477
CONFIG_PHY_MIPHY365X=y
458478
CONFIG_PHY_STIH41X_USB=y
459479
CONFIG_PHY_STIH407_USB=y
@@ -482,3 +502,4 @@ CONFIG_MAGIC_SYSRQ=y
482502
CONFIG_LOCKUP_DETECTOR=y
483503
CONFIG_CRYPTO_DEV_TEGRA_AES=y
484504
CONFIG_CPUFREQ_DT=y
505+
CONFIG_KEYSTONE_IRQ=y

‎arch/arm/configs/mvebu_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
2626
CONFIG_ARM_APPENDED_DTB=y
2727
CONFIG_ARM_ATAG_DTB_COMPAT=y
2828
CONFIG_CPU_FREQ=y
29+
CONFIG_CPUFREQ_DT=y
2930
CONFIG_CPU_IDLE=y
3031
CONFIG_ARM_MVEBU_V7_CPUIDLE=y
3132
CONFIG_VFP=y

0 commit comments

Comments
 (0)