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

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

Pull ARM SoC defconfig updates from Olof Johansson:
 "We keep this in a separate branch to avoid cross-branch conflicts, but
  most of the material here is fairly boring -- some new drivers turned
  on for hardware since they were merged, and some refreshed files due
  to time having moved a lot of entries around"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (36 commits)
  ARM: config: multi_v5: ASPEED SDHCI, SGPIO
  ARM: configs: multi_v7: ASPEED network, gpio, FSI
  ARM: config: aspeed-g4: Add MMC, and cleanup
  ARM: config: aspeed-g5: Add SGPIO and FSI drivers
  ARM: config: aspeed-g5: Enable 8250_DW quirks
  arm64: defconfig: Change CONFIG_AT803X_PHY from m to y
  ARM: shmobile: defconfig: Refresh for v5.4-rc1
  arm64: defconfig: Enable R8A77961 SoC
  ARM: configs: sunxi: Enable MICREL_PHY
  arm64: defconfig: add new Allwinner crypto options
  ARM: configs: sunxi: add new Allwinner crypto options
  ARM: tegra: Enable Tegra VDE driver in tegra_defconfig
  ARM: imx_v6_v7_defconfig: Enable CONFIG_TOUCHSCREEN_DA9052
  arm64: defconfig: Enable configs for S32V234
  arm64: defconfig: Enable CONFIG_KEYBOARD_IMX_SC_KEY as module
  arm64: defconfig: Enable SMMU v3 PMCG
  arm64: defconfig: Enable HiSilicon ZIP controller
  arm64: defconfig: enable Altera GPIO controller
  ARM: multi_v7_defconfig: Enable audio support for stm32mp157
  arm64: defconfig: enable rsu driver
  ...
parents eb275167 a235f803

arch/arm/configs/aspeed_g4_defconfig

+12 −6
Original line number Diff line number Diff line
@@ -132,10 +132,12 @@ CONFIG_ASPEED_BT_IPMI_BMC=y 
CONFIG_HW_RANDOM_TIMERIOMEM=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA9541=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_ASPEED=y

CONFIG_I2C_FSI=y

CONFIG_SPI=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_ASPEED=y
@@ -185,6 +187,12 @@ CONFIG_USB_CONFIGFS_F_LB_SS=y 
CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_PRINTER=y

CONFIG_MMC=y

# CONFIG_PWRSEQ_EMMC is not set

# CONFIG_PWRSEQ_SIMPLE is not set

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ASPEED=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y
@@ -216,7 +224,6 @@ CONFIG_FSI_MASTER_GPIO=y 
CONFIG_FSI_MASTER_HUB=y

CONFIG_FSI_MASTER_AST_CF=y

CONFIG_FSI_SCOM=y

CONFIG_FSI_SBEFIFO=y

CONFIG_FANOTIFY=y

CONFIG_OVERLAY_FS=y

CONFIG_TMPFS=y
@@ -231,7 +238,6 @@ CONFIG_SQUASHFS_ZSTD=y 
# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

# CONFIG_CRYPTO_ECHAINIV is not set

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_USER_API_HASH=y
@@ -247,14 +253,14 @@ CONFIG_DEBUG_INFO_REDUCED=y 
CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_GDB_SCRIPTS=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_PANIC_TIMEOUT=-1

CONFIG_SOFTLOCKUP_DETECTOR=y

# CONFIG_DETECT_HUNG_TASK is not set

CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_PANIC_TIMEOUT=-1

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_FUNCTION_TRACER=y

# CONFIG_RUNTIME_TESTING_MENU is not set

CONFIG_DEBUG_WX=y

CONFIG_DEBUG_USER=y

# CONFIG_RUNTIME_TESTING_MENU is not set

arch/arm/configs/aspeed_g5_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6 
CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_ASPEED_VUART=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_ASPEED_KCS_IPMI_BMC=y

CONFIG_ASPEED_BT_IPMI_BMC=y
@@ -154,6 +155,7 @@ CONFIG_SPI=y 
CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_ASPEED=y

CONFIG_GPIO_ASPEED_SGPIO=y

CONFIG_W1=y

CONFIG_W1_MASTER_GPIO=y

CONFIG_W1_SLAVE_THERM=y
@@ -236,8 +238,10 @@ CONFIG_FSI=y 
CONFIG_FSI_MASTER_GPIO=y

CONFIG_FSI_MASTER_HUB=y

CONFIG_FSI_MASTER_AST_CF=y

CONFIG_FSI_MASTER_ASPEED=y

CONFIG_FSI_SCOM=y

CONFIG_FSI_SBEFIFO=y

CONFIG_FSI_OCC=y

CONFIG_FANOTIFY=y

CONFIG_OVERLAY_FS=y

CONFIG_TMPFS=y

arch/arm/configs/at91_dt_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ CONFIG_ARCH_MULTI_V5=y 
CONFIG_ARCH_AT91=y

CONFIG_SOC_AT91RM9200=y

CONFIG_SOC_AT91SAM9=y

# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_ZBOOT_ROM_TEXT=0x0

arch/arm/configs/exynos_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=y 
CONFIG_SND_SOC_SMDK_WM8994_PCM=y

CONFIG_SND_SOC_SNOW=y

CONFIG_SND_SOC_ODROID=y

CONFIG_SND_SOC_ARNDALE=y

CONFIG_SND_SIMPLE_CARD=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -294,6 +295,7 @@ CONFIG_DEVFREQ_GOV_PERFORMANCE=y 
CONFIG_DEVFREQ_GOV_POWERSAVE=y

CONFIG_DEVFREQ_GOV_USERSPACE=y

CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y

CONFIG_EXYNOS5422_DMC=y

CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y

CONFIG_EXTCON=y

CONFIG_EXTCON_MAX14577=y

arch/arm/configs/imx_v6_v7_defconfig

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

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=y

CONFIG_TOUCHSCREEN_DA9052=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_GOODIX=y

CONFIG_TOUCHSCREEN_MAX11801=y
@@ -236,6 +237,7 @@ CONFIG_DA9062_WATCHDOG=y 
CONFIG_DA9063_WATCHDOG=m

CONFIG_RN5T618_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_IMX7ULP_WDT=y

CONFIG_MFD_DA9052_I2C=y

CONFIG_MFD_DA9062=y

CONFIG_MFD_DA9063=y
@@ -335,7 +337,7 @@ CONFIG_NOP_USB_XCEIV=y 
CONFIG_USB_MXS_PHY=y

CONFIG_USB_GADGET=y

CONFIG_USB_FSL_USB2=y

CONFIG_USB_CONFIGFS=m

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ACM=y

CONFIG_USB_CONFIGFS_OBEX=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE