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

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

Pull SoC defconfig updates from Arnd Bergmann:
 "These are the usual updates, enabling mode newly merged device drivers
  for various Arm and RISC-V based platforms in the defconfig files.

  The Renesas and NXP defconfig files also get a refresh for modified
  Kconfig options"

* tag 'soc-defconfig-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  riscv: defconfig: spacemit: k3: enable clock support
  ARM: defconfig: turn off CONFIG_EXPERT
  ARM: defconfig: move entries
  arm64: defconfig: Enable configurations for Kontron SMARC-sAM67
  ARM: imx_v4_v5_defconfig: update for v6.19-rc1
  arm64: defconfig: Enable Apple Silicon drivers
  arm64: select APPLE_PMGR_PWRSTATE for ARCH_APPLE
  arm64: defconfig: Enable Mediatek HDMIv2 driver
  ARM: shmobile: defconfig: Refresh for v6.19-rc1
  arm64: defconfig: Enable PCIe for the Renesas RZ/G3S SoC
  arm64: defconfig: Enable RZ/G3E USB3 PHY driver
  arm64: defconfig: Enable EC drivers for Qualcomm-based laptops
  arm64: defconfig: Enable options for Qualcomm Milos SoC
  ARM: imx_v6_v7_defconfig: enable EPD regulator needed for Kobo Clara 2e
  ARM: imx_v6_v7_defconfig: Configure CONFIG_SND_SOC_FSL_ASOC_CARD as module
  ARM: multi_v7_defconfig: enable DA9052 and MC13XXX
  arm64: defconfig: enable clocks, interconnect and pinctrl for Qualcomm Kaanapali
  arm64: defconfig: Drop duplicate CONFIG_OMAP_USB2 entry
  arm64: defconfig: Enable missing AMD/Xilinx drivers
parents 2b398c05 6f3f1d83

arch/arm/configs/imx_v4_v5_defconfig

+2 −10
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y
@@ -58,11 +55,9 @@ CONFIG_BLK_DEV_SD=y 
CONFIG_ATA=y

CONFIG_PATA_IMX=y

CONFIG_NETDEVICES=y

CONFIG_CS89x0=y

CONFIG_CS89x0_PLATFORM=y

CONFIG_DM9000=y

CONFIG_SMC91X=y

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

CONFIG_SMSC_PHY=y

CONFIG_INPUT_EVDEV=y
@@ -78,6 +73,7 @@ CONFIG_SERIAL_8250=m 
CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y
@@ -100,12 +96,12 @@ CONFIG_REGULATOR_GPIO=y 
CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_V4L_MEM2MEM_DRIVERS=y

CONFIG_VIDEO_CODA=y

CONFIG_FB=y

CONFIG_FB_IMX=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y
@@ -115,16 +111,12 @@ CONFIG_SND=y 
# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

CONFIG_SND_IMX_SOC=y

CONFIG_SND_SOC_MX27VIS_AIC32X4=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_MC13783=y

CONFIG_SND_SOC_FSL_ASOC_CARD=y

CONFIG_SND_SOC_SGTL5000=y

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

arch/arm/configs/imx_v6_v7_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ CONFIG_REGULATOR_DA9052=y 
CONFIG_REGULATOR_DA9062=y

CONFIG_REGULATOR_DA9063=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_FP9931=m

CONFIG_REGULATOR_LTC3676=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y
@@ -311,7 +312,7 @@ CONFIG_SND_IMX_SOC=y 
CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_SND_SOC_IMX_ES8328=y

CONFIG_SND_SOC_IMX_SGTL5000=y

CONFIG_SND_SOC_FSL_ASOC_CARD=y

CONFIG_SND_SOC_FSL_ASOC_CARD=m

CONFIG_SND_SOC_AC97_CODEC=y

CONFIG_SND_SOC_CS42XX8_I2C=y

CONFIG_SND_SOC_SPDIF=y

arch/arm/configs/multi_v7_defconfig

+33 −18
Original line number Diff line number Diff line
@@ -3,11 +3,12 @@ CONFIG_NO_HZ_IDLE=y 
CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

CONFIG_KEXEC=y

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_AIROHA=y

CONFIG_ARCH_HPE=y

CONFIG_ARCH_HPE_GXP=y

CONFIG_ARCH_SUNPLUS=y

CONFIG_ARCH_UNIPHIER=y

CONFIG_ARCH_ACTIONS=y
@@ -50,8 +51,6 @@ CONFIG_ARCH_HI3xxx=y 
CONFIG_ARCH_HIP01=y

CONFIG_ARCH_HIP04=y

CONFIG_ARCH_HIX5HD2=y

CONFIG_ARCH_HPE=y

CONFIG_ARCH_HPE_GXP=y

CONFIG_ARCH_MXC=y

CONFIG_SOC_IMX50=y

CONFIG_SOC_IMX51=y
@@ -163,7 +162,6 @@ CONFIG_BT_QCOMSMD=m 
CONFIG_CFG80211=m

CONFIG_MAC80211=m

CONFIG_RFKILL=y

CONFIG_RFKILL_INPUT=y

CONFIG_RFKILL_GPIO=y

CONFIG_NFC=m

CONFIG_NFC_DIGITAL=m
@@ -376,7 +374,6 @@ CONFIG_SERIAL_TEGRA=y 
CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=20

CONFIG_SERIAL_MSM=y

CONFIG_SERIAL_MSM_CONSOLE=y

CONFIG_SERIAL_VT8500=y
@@ -548,12 +545,12 @@ CONFIG_DEVFREQ_THERMAL=y 
CONFIG_IMX_THERMAL=y

CONFIG_QORIQ_THERMAL=m

CONFIG_ROCKCHIP_THERMAL=y

CONFIG_RCAR_THERMAL=y

CONFIG_ARMADA_THERMAL=y

CONFIG_BCM2711_THERMAL=m

CONFIG_BCM2835_THERMAL=m

CONFIG_BRCMSTB_THERMAL=m

CONFIG_ST_THERMAL_MEMMAP=y

CONFIG_RCAR_THERMAL=y

CONFIG_TEGRA_SOCTHERM=m

CONFIG_TEGRA30_TSENSOR=m

CONFIG_GENERIC_ADC_THERMAL=m
@@ -598,7 +595,9 @@ CONFIG_MFD_BCM590XX=y 
CONFIG_MFD_AC100=y

CONFIG_MFD_AXP20X_I2C=y

CONFIG_MFD_AXP20X_RSB=y

CONFIG_MFD_DA9052_I2C=y

CONFIG_MFD_DA9063=m

CONFIG_MFD_MC13XXX_I2C=m

CONFIG_MFD_MAX14577=y

CONFIG_MFD_MAX77686=y

CONFIG_MFD_MAX77693=m
@@ -633,6 +632,7 @@ CONFIG_REGULATOR_AS3722=y 
CONFIG_REGULATOR_AXP20X=y

CONFIG_REGULATOR_BCM590XX=y

CONFIG_REGULATOR_CPCAP=y

CONFIG_REGULATOR_DA9052=m

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_FAN53555=y

CONFIG_REGULATOR_GPIO=y
@@ -676,6 +676,7 @@ CONFIG_REGULATOR_WM8994=m 
CONFIG_CEC_SAMSUNG_S5P=m

CONFIG_CEC_STM32=m

CONFIG_MEDIA_SUPPORT=m

# CONFIG_MEDIA_SUPPORT_FILTER is not set

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -715,7 +716,6 @@ CONFIG_VIDEO_ADV7604_CEC=y 
CONFIG_VIDEO_ML86V7667=m

CONFIG_IMX_IPUV3_CORE=m

CONFIG_DRM=y

CONFIG_DRM_I2C_NXP_TDA998X=m

CONFIG_DRM_NOUVEAU=m

# CONFIG_DRM_NOUVEAU_CH7006 is not set

# CONFIG_DRM_NOUVEAU_SIL164 is not set
@@ -741,15 +741,16 @@ CONFIG_DRM_TEGRA=y 
CONFIG_DRM_STM=m

CONFIG_DRM_STM_DSI=m

CONFIG_DRM_PANEL_LVDS=m

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_EDP=y

CONFIG_DRM_PANEL_SAMSUNG_LD9040=m

CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m

CONFIG_DRM_PANEL_RAYDIUM_RM68200=m

CONFIG_DRM_PANEL_SAMSUNG_LD9040=m

CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m

CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m

CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m

CONFIG_DRM_PANEL_EDP=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_DISPLAY_CONNECTOR=m

CONFIG_DRM_I2C_NXP_TDA998X=m

CONFIG_DRM_LVDS_CODEC=m

CONFIG_DRM_NXP_PTN3460=m

CONFIG_DRM_PARADE_PS8622=m
@@ -789,9 +790,9 @@ CONFIG_FRAMEBUFFER_CONSOLE=y 
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_SOUND=m

CONFIG_SND=m

CONFIG_SND_HDA_TEGRA=m

CONFIG_SND_HDA_INPUT_BEEP=y

CONFIG_SND_HDA_PATCH_LOADER=y

CONFIG_SND_HDA_TEGRA=m

CONFIG_SND_HDA_CODEC_REALTEK=m

CONFIG_SND_HDA_CODEC_REALTEK_LIB=m

CONFIG_SND_HDA_CODEC_ALC269=m
@@ -814,6 +815,8 @@ CONFIG_SND_PXA910_SOC=m 
CONFIG_SND_SOC_QCOM=m

CONFIG_SND_SOC_APQ8016_SBC=m

CONFIG_SND_SOC_ROCKCHIP=m

CONFIG_SND_SOC_SH4_FSI=m

CONFIG_SND_SOC_RCAR=m

CONFIG_SND_SOC_ROCKCHIP_SPDIF=m

CONFIG_SND_SOC_ROCKCHIP_MAX98090=m

CONFIG_SND_SOC_ROCKCHIP_RT5645=m
@@ -824,8 +827,6 @@ CONFIG_SND_SOC_SNOW=m 
CONFIG_SND_SOC_ODROID=m

CONFIG_SND_SOC_ARNDALE=m

CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m

CONFIG_SND_SOC_SH4_FSI=m

CONFIG_SND_SOC_RCAR=m

CONFIG_SND_SOC_STI=m

CONFIG_SND_SOC_STM32_SAI=m

CONFIG_SND_SOC_STM32_I2S=m
@@ -859,6 +860,18 @@ CONFIG_SND_SOC_WM8960=m 
CONFIG_SND_SOC_WM8962=m

CONFIG_SND_SOC_WM8978=m

CONFIG_SND_AUDIO_GRAPH_CARD=m

# CONFIG_HID_A4TECH is not set

# CONFIG_HID_APPLE is not set

# CONFIG_HID_BELKIN is not set

# CONFIG_HID_CHERRY is not set

# CONFIG_HID_CHICONY is not set

# CONFIG_HID_CYPRESS is not set

# CONFIG_HID_EZKEY is not set

# CONFIG_HID_ITE is not set

# CONFIG_HID_KENSINGTON is not set

# CONFIG_HID_REDRAGON is not set

# CONFIG_HID_MICROSOFT is not set

# CONFIG_HID_MONTEREY is not set

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_XHCI_HCD=y
@@ -1002,7 +1015,6 @@ CONFIG_RTC_DRV_MAX8997=m 
CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_RK808=m

CONFIG_RTC_DRV_RS5C372=m

CONFIG_RTC_DRV_PCF85063=m

CONFIG_RTC_DRV_PCF85363=m

CONFIG_RTC_DRV_BQ32K=m

CONFIG_RTC_DRV_TWL4030=y
@@ -1013,6 +1025,7 @@ CONFIG_RTC_DRV_S35390A=m 
CONFIG_RTC_DRV_RX8581=m

CONFIG_RTC_DRV_EM3027=y

CONFIG_RTC_DRV_S5M=m

CONFIG_RTC_DRV_PCF85063=m

CONFIG_RTC_DRV_DA9063=m

CONFIG_RTC_DRV_EFI=m

CONFIG_RTC_DRV_DIGICOLOR=m
@@ -1026,6 +1039,7 @@ CONFIG_RTC_DRV_RZN1=m 
CONFIG_RTC_DRV_VT8500=y

CONFIG_RTC_DRV_SUNXI=y

CONFIG_RTC_DRV_MV=y

CONFIG_RTC_DRV_MC13XXX=m

CONFIG_RTC_DRV_PM8XXX=m

CONFIG_RTC_DRV_TEGRA=y

CONFIG_RTC_DRV_ST_LPC=y
@@ -1046,9 +1060,6 @@ CONFIG_OWL_DMA=y 
CONFIG_PL330_DMA=y

CONFIG_STE_DMA40=y

CONFIG_ST_FDMA=m

CONFIG_STM32_DMA=y

CONFIG_STM32_DMAMUX=y

CONFIG_STM32_MDMA=y

CONFIG_TEGRA20_APB_DMA=y

CONFIG_UNIPHIER_MDMAC=y

CONFIG_XILINX_DMA=y
@@ -1057,6 +1068,9 @@ CONFIG_DW_DMAC=y 
CONFIG_RZN1_DMAMUX=m

CONFIG_RCAR_DMAC=y

CONFIG_RENESAS_USB_DMAC=m

CONFIG_STM32_DMA=y

CONFIG_STM32_DMAMUX=y

CONFIG_STM32_MDMA=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_MMIO=y

CONFIG_STAGING=y
@@ -1094,12 +1108,12 @@ CONFIG_TI_MESSAGE_MANAGER=y 
CONFIG_QCOM_APCS_IPC=y

CONFIG_STM32_IPCC=m

CONFIG_QCOM_IPCC=y

CONFIG_QCOM_IOMMU=y

CONFIG_OMAP_IOMMU=y

CONFIG_OMAP_IOMMU_DEBUG=y

CONFIG_ROCKCHIP_IOMMU=y

CONFIG_TEGRA_IOMMU_SMMU=y

CONFIG_EXYNOS_IOMMU=y

CONFIG_QCOM_IOMMU=y

CONFIG_REMOTEPROC=y

CONFIG_OMAP_REMOTEPROC=m

CONFIG_OMAP_REMOTEPROC_WATCHDOG=y
@@ -1135,6 +1149,7 @@ CONFIG_ARCH_TEGRA_124_SOC=y 
CONFIG_SOC_TI=y

CONFIG_KEYSTONE_NAVIGATOR_QMSS=y

CONFIG_KEYSTONE_NAVIGATOR_DMA=y

CONFIG_TI_PRUSS=m

CONFIG_RASPBERRYPI_POWER=y

CONFIG_QCOM_CPR=y

CONFIG_QCOM_RPMHPD=y

arch/arm/configs/shmobile_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ CONFIG_RZ_DMAC=y 
CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_IIO=y

CONFIG_RZN1_ADC=y

CONFIG_AK8975=y

CONFIG_PWM=y

CONFIG_PWM_RENESAS_RCAR=y
@@ -218,7 +219,6 @@ CONFIG_NFS_V3_ACL=y 
CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DMA_CMA=y

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config ARCH_ALPINE 
config ARCH_APPLE

	bool "Apple Silicon SoC family"

	select APPLE_AIC

	select APPLE_PMGR_PWRSTATE if PM

	help

	  This enables support for Apple's in-house ARM SoC family, such

	  as the Apple M1.