Commit a0439cf4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents cc3c470a 2cc1cd26

arch/arm/configs/at91_dt_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ CONFIG_SYSVIPC=y 
CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y
@@ -50,13 +51,13 @@ CONFIG_DEVTMPFS_MOUNT=y 
CONFIG_MTD=y

CONFIG_MTD_TESTS=m

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_FASTMAP=y

CONFIG_MTD_UBI_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4
@@ -205,6 +206,7 @@ CONFIG_PWM_ATMEL=y 
CONFIG_PWM_ATMEL_HLCDC_PWM=y

CONFIG_PWM_ATMEL_TCB=y

CONFIG_EXT4_FS=y

CONFIG_AUTOFS_FS=m

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ CONFIG_IIO=y 
CONFIG_MMA8452=y

CONFIG_IMX7D_ADC=y

CONFIG_RN5T618_ADC=y

CONFIG_STMPE_ADC=y

CONFIG_VF610_ADC=y

CONFIG_SENSORS_ISL29018=y

CONFIG_MAG3110=y

arch/arm/configs/multi_v7_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ CONFIG_ARCH_BCM2835=y 
CONFIG_ARCH_BCM_53573=y

CONFIG_ARCH_BCM_63XX=y

CONFIG_ARCH_BRCMSTB=y

CONFIG_ARCH_BCMBCA=y

CONFIG_ARCH_BERLIN=y

CONFIG_MACH_BERLIN_BG2=y

CONFIG_MACH_BERLIN_BG2CD=y
@@ -662,7 +663,10 @@ CONFIG_VIDEO_S5P_MIPI_CSIS=m 
CONFIG_VIDEO_EXYNOS_FIMC_LITE=m

CONFIG_VIDEO_EXYNOS4_FIMC_IS=m

CONFIG_VIDEO_RCAR_VIN=m

CONFIG_VIDEO_ATMEL_ISC=m

CONFIG_VIDEO_ATMEL_XISC=m

CONFIG_VIDEO_ATMEL_ISI=m

CONFIG_VIDEO_MICROCHIP_CSI2DC=m

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m

CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@ -684,6 +688,7 @@ CONFIG_IMX_IPUV3_CORE=m 
CONFIG_DRM=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_I2C_NXP_TDA998X=m

CONFIG_DRM_NOUVEAU=m

CONFIG_DRM_EXYNOS=m

CONFIG_DRM_EXYNOS_FIMD=y
@@ -798,6 +803,8 @@ CONFIG_SND_SOC_TEGRA_WM9712=m 
CONFIG_SND_SOC_TEGRA_TRIMSLICE=m

CONFIG_SND_SOC_TEGRA_ALC5632=m

CONFIG_SND_SOC_TEGRA_MAX98090=m

CONFIG_SND_SOC_DAVINCI_MCASP=m

CONFIG_SND_SOC_AC97=m

CONFIG_SND_SOC_AK4642=m

CONFIG_SND_SOC_CPCAP=m

CONFIG_SND_SOC_CS42L51_I2C=m

arch/arm/configs/omap2plus_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -553,6 +553,8 @@ CONFIG_SND_SOC_OMAP_ABE_TWL6040=m 
CONFIG_SND_SOC_OMAP_HDMI=m

CONFIG_SND_SOC_CPCAP=m

CONFIG_SND_SOC_TLV320AIC23_I2C=m

CONFIG_SND_SOC_TLV320AIC3X=m

CONFIG_SND_SOC_TLV320AIC3X_I2C=m

CONFIG_SND_SIMPLE_CARD=m

CONFIG_SND_AUDIO_GRAPH_CARD=m

CONFIG_HID_GENERIC=m
@@ -576,6 +578,7 @@ CONFIG_USB_INVENTRA_DMA=y 
CONFIG_USB_TI_CPPI41_DMA=y

CONFIG_USB_TUSB_OMAP_DMA=y

CONFIG_USB_DWC3=m

CONFIG_USB_ISP1760=m

CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_SIMPLE=m

arch/arm/configs/qcom_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -295,12 +295,20 @@ CONFIG_NLS_CODEPAGE_437=y 
CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_UTF8=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_USER_API=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_DEV_QCOM_RNG=m

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_WATCHDOG=y

CONFIG_QCOM_WDT=y