Commit 92c59e12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM defconfig updates from Arnd Bergmann:
 "These are the usual updates to arm/arm64 defconfig files, enabling
  newly added drivers and addressing changes to Kconfig files"

* tag 'arm-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits)
  ARM: configs: at91: sama5: enable CAN PLATFORM driver
  ARM: configs: at91: sama5: enable bridge and VLAN filtering
  ARM: configs: at91: sama5: add support for KSZ ethernet switches
  arm64: defconfig: Enable AM654x SDHCI controller
  arm64: arch_k3: enable chipid driver
  arm/arm64: defconfig: Update configs to use the new CROS_EC options
  ARM: tegra_defconfig: Enable options useful for Nexus 7 and Acer A500
  ARM: tegra: Enable CPUFREQ userspace governor
  arm64: defconfig: enable CONFIG_FSL_ENETC_QOS
  arm64: defconfig: enable TSN features for ENETC and similiar hardware
  ARM: imx_v6_v7_defconfig: Support i.MX8MM
  arm64: defconfig: enable RTC and audio support on Kontron sl28 boards
  arm64: defconfig: add pca9450 pmic driver
  ARM: configs: sunxi: Enable crypto related options
  ARM: sunxi: configs: Enable the Mailbox driver
  ARM: configs: sunxi: Enable the PS/2 controller
  ARM: configs: sunxi: Enable Lima
  ARM: configs: sunxi: Add DRM output-related options
  ARM: configs: sunxi: Enable ASoC options
  ARM: configs: sunxi: Enable Cedrus
  ...
parents 09a0bd07 66d30378

arch/arm/configs/exynos_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ CONFIG_DEVFREQ_THERMAL=y 
CONFIG_THERMAL_EMULATION=y

CONFIG_WATCHDOG=y

CONFIG_S3C2410_WATCHDOG=y

CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_DEV=y

CONFIG_CHROME_PLATFORMS=y

CONFIG_CROS_EC=y

CONFIG_MFD_MAX14577=y

CONFIG_MFD_MAX77686=y

CONFIG_MFD_MAX77693=y

arch/arm/configs/imx_v6_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ CONFIG_SPI=y 
CONFIG_SPI_GPIO=y

CONFIG_SPI_IMX=y

CONFIG_SPI_FSL_DSPI=y

CONFIG_PINCTRL_IMX8MM=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SIOX=m

CONFIG_GPIO_MAX732X=y
@@ -406,6 +407,8 @@ CONFIG_STAGING=y 
CONFIG_STAGING_MEDIA=y

CONFIG_VIDEO_IMX_MEDIA=y

CONFIG_COMMON_CLK_PWM=y

CONFIG_CLK_IMX8MM=y

CONFIG_SOC_IMX8M=y

CONFIG_IIO=y

CONFIG_MMA8452=y

CONFIG_IMX7D_ADC=y

arch/arm/configs/multi_v7_defconfig

+10 −1
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m 
CONFIG_INPUT_MAX8997_HAPTIC=m

CONFIG_INPUT_CPCAP_PWRBUTTON=m

CONFIG_INPUT_AXP20X_PEK=m

CONFIG_INPUT_DA9063_ONKEY=m

CONFIG_INPUT_ADXL34X=m

CONFIG_INPUT_STPMIC1_ONKEY=y

CONFIG_SERIO_AMBAKMI=y
@@ -520,6 +521,7 @@ CONFIG_TEGRA_WATCHDOG=m 
CONFIG_MESON_WATCHDOG=y

CONFIG_DIGICOLOR_WATCHDOG=y

CONFIG_RENESAS_WDT=m

CONFIG_RENESAS_RZAWDT=m

CONFIG_STPMIC1_WATCHDOG=y

CONFIG_BCM47XX_WDT=y

CONFIG_BCM2835_WDT=y
@@ -618,6 +620,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_VIDEO_MMP_CAMERA=m

CONFIG_VIDEO_ASPEED=m

CONFIG_VIDEO_STM32_DCMI=m

CONFIG_VIDEO_RENESAS_CEU=m

CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m

CONFIG_VIDEO_S5P_FIMC=m

CONFIG_VIDEO_S5P_MIPI_CSIS=m
@@ -640,6 +643,8 @@ CONFIG_VIDEO_VIVID=m 
CONFIG_CEC_PLATFORM_DRIVERS=y

CONFIG_CEC_SAMSUNG_S5P=m

CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_ADV7604=m

CONFIG_VIDEO_ADV7604_CEC=y

CONFIG_VIDEO_ML86V7667=m

CONFIG_IMX_IPUV3_CORE=m

CONFIG_DRM=y
@@ -901,6 +906,7 @@ CONFIG_RTC_DRV_EFI=m 
CONFIG_RTC_DRV_DIGICOLOR=m

CONFIG_RTC_DRV_S3C=m

CONFIG_RTC_DRV_SA1100=m

CONFIG_RTC_DRV_SH=m

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_AT91RM9200=m

CONFIG_RTC_DRV_AT91SAM9=m
@@ -945,7 +951,7 @@ CONFIG_SERIO_NVEC_PS2=y 
CONFIG_NVEC_POWER=y

CONFIG_NVEC_PAZ00=y

CONFIG_STAGING_BOARD=y

CONFIG_MFD_CROS_EC=m

CONFIG_MFD_CROS_EC_DEV=m

CONFIG_CROS_EC_I2C=m

CONFIG_CROS_EC_SPI=m

CONFIG_COMMON_CLK_MAX77686=y
@@ -1126,3 +1132,6 @@ CONFIG_CMA_SIZE_MBYTES=64 
CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_CHROME_PLATFORMS=y

CONFIG_CROS_EC=m

CONFIG_CROS_EC_CHARDEV=m

arch/arm/configs/pxa_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -391,7 +391,9 @@ CONFIG_SA1100_WATCHDOG=m 
CONFIG_MFD_AS3711=y

CONFIG_MFD_BCM590XX=m

CONFIG_MFD_AXP20X=y

CONFIG_MFD_CROS_EC=m

CONFIG_MFD_CROS_EC_DEV=m

CONFIG_CHROME_PLATFORMS=y

CONFIG_CROS_EC=m

CONFIG_CROS_EC_I2C=m

CONFIG_CROS_EC_SPI=m

CONFIG_MFD_ASIC3=y

arch/arm/configs/sama5_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -49,9 +49,14 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

CONFIG_IPV6_SIT_6RD=y

CONFIG_BRIDGE=m

CONFIG_BRIDGE_VLAN_FILTERING=y

CONFIG_NET_DSA=m

CONFIG_VLAN_8021Q=m

CONFIG_CAN=y

CONFIG_CAN_AT91=y

CONFIG_CAN_M_CAN=y

CONFIG_CAN_M_CAN_PLATFORM=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_MAC80211_LEDS=y
@@ -80,6 +85,8 @@ CONFIG_SCSI=y 
CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_NET_DSA_MICROCHIP_KSZ9477=m

CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m

CONFIG_MACB=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -165,6 +172,7 @@ CONFIG_SND_SOC=y 
CONFIG_SND_ATMEL_SOC=y

CONFIG_SND_ATMEL_SOC_WM8904=y

# CONFIG_HID_GENERIC is not set

CONFIG_SND_ATMEL_SOC_CLASSD=y

CONFIG_SND_ATMEL_SOC_PDMIC=y

CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m

CONFIG_SND_ATMEL_SOC_I2S=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE