Commit 9b48c8f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM defconfig updates from Arnd Bergmann:
 "As usual, tons of new drivers and other options got merged and are now
  enabled in the defconfig files, usually as loadable modules"

* tag 'arm-defconfig-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (45 commits)
  ARM: omap2plus_defconfig: Update for moved and dropped options
  ARM: omap2plus_defconfig: Enable ina2xx_adc as a loadable module
  ARM: omap2plus_defconfig: Enable McPDM optional PMIC clock as modules
  ARM: omap2plus_defconfig: Enable more droid4 devices as loadable modules
  ARM: omap2plus_defconfig: Enable zram as loadable modules
  ARM: omap2plus_defconfig: Enable simple-pm-bus
  arm64: defconfig: Enable Qualcomm SDM845 audio configs
  arm64: defconfig: Enable e1000 device
  arm64: defconfig: Enable PHY devices used on QorIQ boards
  arm64: defconfig: Enable RTC devices for QorIQ boards
  arm64: defconfig: Enable flash device drivers for QorIQ boards
  arm64: defconfig: Enable ARM Mali display driver
  arm64: defconfig: Enable QorIQ GPIO driver
  arm64: defconfig: Enable QorIQ IFC NAND controller driver
  arm64: defconfig: Enable ARM SBSA watchdog driver
  arm64: defconfig: Enable QorIQ cpufreq driver
  arm64: defconfig: Enable NXP/FSL SPI controller drivers
  arm64: defconfig: Enable ENETC Ethernet controller and FELIX switch
  arm64: defconfig: Enable QorIQ DPAA2 drivers
  arm64: defconfig: Enable QorIQ DPAA1 drivers
  ...
parents d18292dc a0705d3c

arch/arm/configs/at91_dt_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ CONFIG_POWER_SUPPLY=y 
# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_AT91SAM9X_WATCHDOG=y

CONFIG_SAMA5D4_WATCHDOG=y

CONFIG_MFD_ATMEL_FLEXCOM=y

CONFIG_MFD_ATMEL_HLCDC=y

CONFIG_REGULATOR=y

arch/arm/configs/bcm2835_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_NETDEVICES=y

CONFIG_BCMGENET=y

CONFIG_USB_LAN78XX=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC95XX=y
@@ -96,9 +97,13 @@ CONFIG_SPI_BCM2835AUX=y 
CONFIG_GPIO_SYSFS=y

CONFIG_SENSORS_RASPBERRYPI_HWMON=m

CONFIG_THERMAL=y

CONFIG_BCM2711_THERMAL=y

CONFIG_BCM2835_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_BCM2835_WDT=y

CONFIG_MFD_SYSCON=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_DRM=y

arch/arm/configs/exynos_defconfig

+10 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_PERF_EVENTS=y 
CONFIG_ARCH_EXYNOS=y

CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_BIG_LITTLE=y

CONFIG_NR_CPUS=8

CONFIG_HIGHMEM=y
@@ -17,6 +18,7 @@ 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_ENERGY_MODEL=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -92,7 +94,7 @@ CONFIG_DEVTMPFS_MOUNT=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y
@@ -111,11 +113,13 @@ CONFIG_USB_LAN78XX=m 
CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_BRCMFMAC=m

CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_SAMSUNG=y

CONFIG_KEYBOARD_TM2_TOUCHKEY=y

CONFIG_KEYBOARD_CROS_EC=y

# CONFIG_MOUSE_PS2 is not set

CONFIG_MOUSE_CYAPA=y
@@ -204,6 +208,9 @@ CONFIG_V4L_TEST_DRIVERS=y 
CONFIG_VIDEO_VIVID=m

CONFIG_CEC_PLATFORM_DRIVERS=y

CONFIG_VIDEO_SAMSUNG_S5P_CEC=m

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_S5K6A3=m

CONFIG_VIDEO_S5C73M3=m

CONFIG_DRM=y

CONFIG_DRM_EXYNOS=y

CONFIG_DRM_EXYNOS_FIMD=y
@@ -276,6 +283,7 @@ CONFIG_MMC_DW_EXYNOS=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_AAT1290=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_MAX77693=y
@@ -320,6 +328,7 @@ CONFIG_VFAT_FS=y 
CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CRAMFS=y

CONFIG_SQUASHFS=y

CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V4=y

arch/arm/configs/imx_v6_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ CONFIG_MOUSE_PS2=m 
CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=y

CONFIG_TOUCHSCREEN_AD7879=y

CONFIG_TOUCHSCREEN_AD7879_I2C=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_DA9052=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_GOODIX=y

arch/arm/configs/multi_v7_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ CONFIG_CPU_IDLE=y 
CONFIG_ARM_CPUIDLE=y

CONFIG_ARM_ZYNQ_CPUIDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

CONFIG_ARM_TEGRA_CPUIDLE=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_RASPBERRYPI_FIRMWARE=y

CONFIG_TRUSTED_FOUNDATIONS=y
@@ -640,6 +641,7 @@ CONFIG_CEC_PLATFORM_DRIVERS=y 
CONFIG_VIDEO_SAMSUNG_S5P_CEC=m

CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_ML86V7667=m

CONFIG_IMX_IPUV3_CORE=m

CONFIG_DRM=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set
@@ -655,6 +657,11 @@ CONFIG_ROCKCHIP_ANALOGIX_DP=y 
CONFIG_ROCKCHIP_DW_HDMI=y

CONFIG_ROCKCHIP_DW_MIPI_DSI=y

CONFIG_ROCKCHIP_INNO_HDMI=y

CONFIG_DRM_IMX=m

CONFIG_DRM_IMX_PARALLEL_DISPLAY=m

CONFIG_DRM_IMX_TVE=m

CONFIG_DRM_IMX_LDB=m

CONFIG_DRM_IMX_HDMI=m

CONFIG_DRM_ATMEL_HLCDC=m

CONFIG_DRM_RCAR_DU=m

CONFIG_DRM_RCAR_LVDS=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE