Skip to content

Commit a0439cf

Browse files
committed
Merge tag 'arm-defconfig-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM defconfig updates from Arnd Bergmann: "Lots of smaller additions to the defconfig files for both 32-bit and 64-bit arm platforms, enabling drivers that are now usable on common hardware, and a few options to make it possible to boot a file system image using systemd" * tag 'arm-defconfig-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (39 commits) ARM: configs: Enable ASoC AC'97 glue ARM: configs: Enable audio on BeagleBone Black in multi_v7_defconfig ARM: configs: at91: Enable AUTOFS_FS required by systemd ARM: configs: at91: Enable options required for systemd ARM: configs: at91: sama7: enable CONFIG_RESET_CONTROLLER ARM: configs: at91: sama7: add MCHP PDMC and DMIC drivers ARM: configs: at91: sama7: Enable MTD_UBI_BLOCK ARM: configs: at91: sama7: Enable MTD_UBI_FASTMAP ARM: configs: at91: sama7: add xisc and csi2dc ARM: multi_v7_defconfig: add atmel video pipeline modules ARM: configs: at91: Remove MTD_BLOCK and use MTD_UBI_BLOCK for read only block FS arm64: defconfig: Enable the WM8524 codec driver arm64: defconfig: Enable modules for arm displays arm: nomadik: drop selecting obsolete CLKSRC_NOMADIK_MTU_SCHED_CLOCK arm64: defconfig: Enable Renesas RZ/V2M SoC arm64: defconfig: Enable ARCH_R9A07G043 arm64: defconfig: Enable configs for DisplayPort on J721e arm64: defconfig: Build Tegra ASRC module ARM: multi_v7_defconfig: enable CONFIG_ARCH_BCMBCA in armv7 defconfig arm: mediatek: select arch timer for mt7629 ...
2 parents cc3c470 + 2cc1cd2 commit a0439cf

File tree

11 files changed

+68
-5
lines changed

11 files changed

+68
-5
lines changed

arch/arm/configs/at91_dt_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y
44
CONFIG_NO_HZ_IDLE=y
55
CONFIG_HIGH_RES_TIMERS=y
66
CONFIG_LOG_BUF_SHIFT=14
7+
CONFIG_CGROUPS=y
78
CONFIG_BLK_DEV_INITRD=y
89
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
910
CONFIG_KALLSYMS_ALL=y
@@ -50,13 +51,13 @@ CONFIG_DEVTMPFS_MOUNT=y
5051
CONFIG_MTD=y
5152
CONFIG_MTD_TESTS=m
5253
CONFIG_MTD_CMDLINE_PARTS=y
53-
CONFIG_MTD_BLOCK=y
5454
CONFIG_MTD_DATAFLASH=y
5555
CONFIG_MTD_RAW_NAND=y
5656
CONFIG_MTD_NAND_ATMEL=y
5757
CONFIG_MTD_SPI_NOR=y
5858
CONFIG_MTD_UBI=y
5959
CONFIG_MTD_UBI_FASTMAP=y
60+
CONFIG_MTD_UBI_BLOCK=y
6061
CONFIG_BLK_DEV_LOOP=y
6162
CONFIG_BLK_DEV_RAM=y
6263
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -205,6 +206,7 @@ CONFIG_PWM_ATMEL=y
205206
CONFIG_PWM_ATMEL_HLCDC_PWM=y
206207
CONFIG_PWM_ATMEL_TCB=y
207208
CONFIG_EXT4_FS=y
209+
CONFIG_AUTOFS_FS=m
208210
CONFIG_FANOTIFY=y
209211
CONFIG_VFAT_FS=y
210212
CONFIG_TMPFS=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ CONFIG_IIO=y
402402
CONFIG_MMA8452=y
403403
CONFIG_IMX7D_ADC=y
404404
CONFIG_RN5T618_ADC=y
405+
CONFIG_STMPE_ADC=y
405406
CONFIG_VF610_ADC=y
406407
CONFIG_SENSORS_ISL29018=y
407408
CONFIG_MAG3110=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONFIG_ARCH_BCM2835=y
2929
CONFIG_ARCH_BCM_53573=y
3030
CONFIG_ARCH_BCM_63XX=y
3131
CONFIG_ARCH_BRCMSTB=y
32+
CONFIG_ARCH_BCMBCA=y
3233
CONFIG_ARCH_BERLIN=y
3334
CONFIG_MACH_BERLIN_BG2=y
3435
CONFIG_MACH_BERLIN_BG2CD=y
@@ -662,7 +663,10 @@ CONFIG_VIDEO_S5P_MIPI_CSIS=m
662663
CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
663664
CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
664665
CONFIG_VIDEO_RCAR_VIN=m
666+
CONFIG_VIDEO_ATMEL_ISC=m
667+
CONFIG_VIDEO_ATMEL_XISC=m
665668
CONFIG_VIDEO_ATMEL_ISI=m
669+
CONFIG_VIDEO_MICROCHIP_CSI2DC=m
666670
CONFIG_V4L_MEM2MEM_DRIVERS=y
667671
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
668672
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@ -684,6 +688,7 @@ CONFIG_IMX_IPUV3_CORE=m
684688
CONFIG_DRM=y
685689
# CONFIG_DRM_I2C_CH7006 is not set
686690
# CONFIG_DRM_I2C_SIL164 is not set
691+
CONFIG_DRM_I2C_NXP_TDA998X=m
687692
CONFIG_DRM_NOUVEAU=m
688693
CONFIG_DRM_EXYNOS=m
689694
CONFIG_DRM_EXYNOS_FIMD=y
@@ -798,6 +803,8 @@ CONFIG_SND_SOC_TEGRA_WM9712=m
798803
CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
799804
CONFIG_SND_SOC_TEGRA_ALC5632=m
800805
CONFIG_SND_SOC_TEGRA_MAX98090=m
806+
CONFIG_SND_SOC_DAVINCI_MCASP=m
807+
CONFIG_SND_SOC_AC97=m
801808
CONFIG_SND_SOC_AK4642=m
802809
CONFIG_SND_SOC_CPCAP=m
803810
CONFIG_SND_SOC_CS42L51_I2C=m

arch/arm/configs/omap2plus_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,8 @@ CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
553553
CONFIG_SND_SOC_OMAP_HDMI=m
554554
CONFIG_SND_SOC_CPCAP=m
555555
CONFIG_SND_SOC_TLV320AIC23_I2C=m
556+
CONFIG_SND_SOC_TLV320AIC3X=m
557+
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
556558
CONFIG_SND_SIMPLE_CARD=m
557559
CONFIG_SND_AUDIO_GRAPH_CARD=m
558560
CONFIG_HID_GENERIC=m
@@ -576,6 +578,7 @@ CONFIG_USB_INVENTRA_DMA=y
576578
CONFIG_USB_TI_CPPI41_DMA=y
577579
CONFIG_USB_TUSB_OMAP_DMA=y
578580
CONFIG_USB_DWC3=m
581+
CONFIG_USB_ISP1760=m
579582
CONFIG_USB_SERIAL=m
580583
CONFIG_USB_SERIAL_GENERIC=y
581584
CONFIG_USB_SERIAL_SIMPLE=m

arch/arm/configs/qcom_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,20 @@ CONFIG_NLS_CODEPAGE_437=y
295295
CONFIG_NLS_ASCII=y
296296
CONFIG_NLS_ISO8859_1=y
297297
CONFIG_NLS_UTF8=y
298+
CONFIG_CRYPTO_USER=m
299+
CONFIG_CRYPTO_USER_API=m
300+
CONFIG_CRYPTO_USER_API_HASH=m
301+
CONFIG_CRYPTO_USER_API_SKCIPHER=m
302+
CONFIG_CRYPTO_USER_API_AEAD=m
303+
CONFIG_CRYPTO_USER_API_RNG=m
304+
CONFIG_CRYPTO_DEV_QCOM_RNG=m
298305
CONFIG_DMA_CMA=y
299306
CONFIG_CMA_SIZE_MBYTES=64
300307
CONFIG_PRINTK_TIME=y
301308
CONFIG_DYNAMIC_DEBUG=y
302309
CONFIG_DEBUG_INFO=y
303310
CONFIG_MAGIC_SYSRQ=y
311+
CONFIG_DEBUG_FS=y
304312
# CONFIG_SCHED_DEBUG is not set
305313
CONFIG_WATCHDOG=y
306314
CONFIG_QCOM_WDT=y

arch/arm/configs/sama5_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ CONFIG_DEVTMPFS_MOUNT=y
5757
CONFIG_MTD=y
5858
CONFIG_MTD_TESTS=m
5959
CONFIG_MTD_CMDLINE_PARTS=y
60-
CONFIG_MTD_BLOCK=y
6160
CONFIG_MTD_CFI=y
6261
CONFIG_MTD_RAW_NAND=y
6362
CONFIG_MTD_NAND_ATMEL=y
6463
CONFIG_MTD_SPI_NOR=y
6564
CONFIG_MTD_UBI=y
6665
CONFIG_MTD_UBI_FASTMAP=y
66+
CONFIG_MTD_UBI_BLOCK=y
6767
CONFIG_BLK_DEV_LOOP=y
6868
CONFIG_BLK_DEV_RAM=y
6969
CONFIG_BLK_DEV_RAM_COUNT=4
@@ -222,6 +222,7 @@ CONFIG_PWM_ATMEL_HLCDC_PWM=y
222222
CONFIG_PWM_ATMEL_TCB=y
223223
CONFIG_EXT4_FS=y
224224
CONFIG_FANOTIFY=y
225+
CONFIG_AUTOFS_FS=m
225226
CONFIG_VFAT_FS=y
226227
CONFIG_TMPFS=y
227228
CONFIG_UBIFS_FS=y

arch/arm/configs/sama7_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ CONFIG_MTD_NAND_ATMEL=y
9494
# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
9595
CONFIG_MTD_SPI_NOR=y
9696
CONFIG_MTD_UBI=y
97+
CONFIG_MTD_UBI_FASTMAP=y
98+
CONFIG_MTD_UBI_BLOCK=y
9799
CONFIG_BLK_DEV_LOOP=y
98100
CONFIG_BLK_DEV_RAM=y
99101
CONFIG_BLK_DEV_RAM_COUNT=1
@@ -138,6 +140,8 @@ CONFIG_MEDIA_SUPPORT_FILTER=y
138140
CONFIG_MEDIA_CAMERA_SUPPORT=y
139141
CONFIG_MEDIA_PLATFORM_SUPPORT=y
140142
CONFIG_V4L_PLATFORM_DRIVERS=y
143+
CONFIG_VIDEO_ATMEL_XISC=y
144+
CONFIG_VIDEO_MICROCHIP_CSI2DC=y
141145
CONFIG_VIDEO_IMX219=m
142146
CONFIG_VIDEO_IMX274=m
143147
CONFIG_VIDEO_OV5647=m
@@ -149,6 +153,8 @@ CONFIG_SND_SOC_MIKROE_PROTO=m
149153
CONFIG_SND_MCHP_SOC_I2S_MCC=y
150154
CONFIG_SND_MCHP_SOC_SPDIFTX=y
151155
CONFIG_SND_MCHP_SOC_SPDIFRX=y
156+
CONFIG_SND_MCHP_SOC_PDMC=y
157+
CONFIG_SND_SOC_DMIC=y
152158
CONFIG_SND_SOC_PCM5102A=y
153159
CONFIG_SND_SOC_SPDIF=y
154160
CONFIG_SND_SIMPLE_CARD=y
@@ -190,9 +196,11 @@ CONFIG_AT91_SAMA5D2_ADC=y
190196
CONFIG_PWM=y
191197
CONFIG_PWM_ATMEL=y
192198
CONFIG_MCHP_EIC=y
199+
CONFIG_RESET_CONTROLLER=y
193200
CONFIG_EXT2_FS=y
194201
CONFIG_EXT3_FS=y
195202
CONFIG_FANOTIFY=y
203+
CONFIG_AUTOFS_FS=m
196204
CONFIG_VFAT_FS=y
197205
CONFIG_TMPFS=y
198206
CONFIG_UBIFS_FS=y

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ CONFIG_MEDIA_SUPPORT=y
119119
CONFIG_MEDIA_CAMERA_SUPPORT=y
120120
CONFIG_MEDIA_PLATFORM_SUPPORT=y
121121
CONFIG_V4L_PLATFORM_DRIVERS=y
122+
CONFIG_V4L_MEM2MEM_DRIVERS=y
122123
CONFIG_VIDEO_RENESAS_CEU=y
123124
CONFIG_VIDEO_RCAR_VIN=y
124-
CONFIG_V4L_MEM2MEM_DRIVERS=y
125125
CONFIG_VIDEO_RENESAS_FDP1=y
126126
CONFIG_VIDEO_RENESAS_JPU=y
127127
CONFIG_VIDEO_RENESAS_VSP1=y
@@ -224,5 +224,5 @@ CONFIG_NLS_ISO8859_1=y
224224
CONFIG_DMA_CMA=y
225225
CONFIG_CMA_SIZE_MBYTES=64
226226
CONFIG_PRINTK_TIME=y
227-
CONFIG_DEBUG_FS=y
228227
CONFIG_DEBUG_KERNEL=y
228+
CONFIG_DEBUG_FS=y

arch/arm/mach-mediatek/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ config MACH_MT7623
3030
config MACH_MT7629
3131
bool "MediaTek MT7629 SoCs support"
3232
default ARCH_MEDIATEK
33+
select HAVE_ARM_ARCH_TIMER
3334

3435
config MACH_MT8127
3536
bool "MediaTek MT8127 SoCs support"

arch/arm/mach-nomadik/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ menuconfig ARCH_NOMADIK
55
select ARM_AMBA
66
select ARM_VIC
77
select CLKSRC_NOMADIK_MTU
8-
select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
98
select CPU_ARM926T
109
select GPIOLIB
1110
select MFD_SYSCON

0 commit comments

Comments
 (0)