Commit 4c10d222 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SoC defconfig updates from Arnd Bergmann:
 "As usual, more drivers get enabled in the defconfigs, to support newly
  added hardware drivers.

  There is one change for Tegra that modifies the Kconfig file at the
  same time, and the NXP arm32 defconfigs get a refresh"

* tag 'soc-defconfig-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits)
  arm: multi_v7_defconfig: Enable TPS65219 regulator
  arm: omap2plus_defconfig: Enable TPS65219 regulator
  arm64: defconfig: Enable Tegra241 and Tegra264
  riscv: defconfig: spacemit: enable sdhci driver for K1 SoC
  riscv: defconfig: Enable PWM support for SpacemiT K1 SoC
  riscv: defconfig: Remove CONFIG_SND_SOC_STARFIVE=m
  arm64: defconfig: Enable Tegra HSP and BPMP
  ARM: imx_v6_v7_defconfig: select CONFIG_USB_HSIC_USB3503
  ARM: imx_v6_v7_defconfig: select CONFIG_INPUT_PWM_BEEPER
  ARM: imx_v6_v7_defconfig: cleanup with savedefconfig
  ARM: mxs_defconfig: select new drivers used by imx28-amarula-rmm
  ARM: mxs_defconfig: Cleanup mxs_defconfig
  arm64: defconfig: enable further Rockchip platform drivers
  arm64: defconfig: enable Samsung PMIC over ACPM
  arm64: defconfig: enable Maxim max77759 driver
  ARM: configs: sama5_defconfig: Select CONFIG_WILC1000_SDIO
  ARM: shmobile: defconfig: Refresh for v6.16-rc2
  arm64: defconfig: Enable RZ/V2H(P) USB2 PHY controller reset driver
  arm64: defconfig: add S32G RTC module support
  arm64: defconfig: Drop unneeded unselectable sound drivers
  ...
parents 4df9c0a2 5cfe03e1

arch/arm/configs/imx_v6_v7_defconfig

+7 −21
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CONFIG_RELAY=y 
CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_PERF_EVENTS=y

CONFIG_KEXEC=y

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_MXC=y

CONFIG_SOC_IMX31=y
@@ -32,7 +33,6 @@ CONFIG_ARM_PSCI=y 
CONFIG_HIGHMEM=y

CONFIG_ARCH_FORCE_MAX_ORDER=13

CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"

CONFIG_KEXEC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -68,6 +68,7 @@ CONFIG_BT=y 
CONFIG_BT_BNEP=m

CONFIG_BT_HCIUART=y

CONFIG_BT_HCIUART_LL=y

CONFIG_BT_HCIUART_BCM=y

CONFIG_BT_NXPUART=m

CONFIG_CFG80211=y

CONFIG_CFG80211_WEXT=y
@@ -129,7 +130,6 @@ CONFIG_CS89x0_PLATFORM=y 
CONFIG_QCA7000_SPI=m

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMC91X=y

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_MICREL_PHY=y
@@ -153,9 +153,7 @@ CONFIG_MWIFIEX_PCIE=m 
CONFIG_WL12XX=m

CONFIG_WL18XX=m

CONFIG_WLCORE_SDIO=m

# CONFIG_WILINK_PLATFORM_DATA is not set

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_SNVS_PWRKEY=y

CONFIG_KEYBOARD_IMX=y
@@ -183,6 +181,7 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_MMA8450=y

CONFIG_INPUT_GPIO_BEEPER=m

CONFIG_INPUT_PWM_BEEPER=y

CONFIG_SERIO_SERPORT=m

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_IMX=y
@@ -190,9 +189,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y 
CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_SERIAL_DEV_BUS=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_GPIO=y

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_ALGOPCF=m
@@ -204,14 +201,9 @@ CONFIG_SPI_FSL_QUADSPI=y 
CONFIG_SPI_GPIO=y

CONFIG_SPI_IMX=y

CONFIG_SPI_FSL_DSPI=y

CONFIG_PINCTRL_IMX8MM=y

CONFIG_PINCTRL_IMX8MN=y

CONFIG_PINCTRL_IMX8MP=y

CONFIG_PINCTRL_IMX8MQ=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MXC=y

CONFIG_GPIO_SIOX=m

CONFIG_GPIO_VF610=y

CONFIG_GPIO_MAX732X=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCA953X_IRQ=y
@@ -225,7 +217,6 @@ CONFIG_W1_SLAVE_THERM=m 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON_POWEROFF=y

CONFIG_POWER_SUPPLY=y

CONFIG_RN5T618_POWER=m

CONFIG_SENSORS_MC13783_ADC=y

CONFIG_SENSORS_GPIO_FAN=y
@@ -283,13 +274,13 @@ CONFIG_VIDEO_OV5645=m 
CONFIG_VIDEO_ADV7180=m

CONFIG_IMX_IPUV3_CORE=y

CONFIG_DRM=y

CONFIG_DRM_I2C_NXP_TDA998X=y

CONFIG_DRM_MSM=y

CONFIG_DRM_PANEL_LVDS=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_EDP=y

CONFIG_DRM_PANEL_SEIKO_43WVF1G=y

CONFIG_DRM_PANEL_EDP=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_DISPLAY_CONNECTOR=y

CONFIG_DRM_I2C_NXP_TDA998X=y

CONFIG_DRM_LVDS_CODEC=m

CONFIG_DRM_SII902X=y

CONFIG_DRM_TI_TFP410=y
@@ -310,7 +301,6 @@ CONFIG_LCD_PLATFORM=y 
CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_BACKLIGHT_GPIO=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -346,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m 
CONFIG_USB_SERIAL_OPTION=m

CONFIG_USB_TEST=m

CONFIG_USB_EHSET_TEST_FIXTURE=m

CONFIG_USB_HSIC_USB3503=y

CONFIG_USB_ONBOARD_DEV=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MXS_PHY=y
@@ -380,11 +371,8 @@ CONFIG_MMC=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_ONESHOT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -453,7 +441,6 @@ CONFIG_EXT3_FS_POSIX_ACL=y 
CONFIG_EXT3_FS_SECURITY=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

# CONFIG_PRINT_QUOTA_WARNING is not set

CONFIG_AUTOFS_FS=y

CONFIG_FUSE_FS=y

CONFIG_ISO9660_FS=m
@@ -490,5 +477,4 @@ CONFIG_PRINTK_TIME=y 
CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_FTRACE is not set

arch/arm/configs/multi_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m 
CONFIG_INPUT_MAX8997_HAPTIC=m

CONFIG_INPUT_GPIO_DECODER=m

CONFIG_INPUT_CPCAP_PWRBUTTON=m

CONFIG_INPUT_TPS65219_PWRBUTTON=m

CONFIG_INPUT_AXP20X_PEK=m

CONFIG_INPUT_DA9063_ONKEY=m

CONFIG_INPUT_ADXL34X=m
@@ -618,6 +619,7 @@ CONFIG_MFD_PALMAS=y 
CONFIG_MFD_TPS65090=y

CONFIG_MFD_TPS65217=y

CONFIG_MFD_TPS65218=y

CONFIG_MFD_TPS65219=y

CONFIG_MFD_TPS6586X=y

CONFIG_MFD_TPS65910=y

CONFIG_MFD_STM32_LPTIMER=m
@@ -667,6 +669,7 @@ CONFIG_REGULATOR_TPS62360=y 
CONFIG_REGULATOR_TPS65090=y

CONFIG_REGULATOR_TPS65217=y

CONFIG_REGULATOR_TPS65218=y

CONFIG_REGULATOR_TPS65219=y

CONFIG_REGULATOR_TPS6586X=y

CONFIG_REGULATOR_TPS65910=y

CONFIG_REGULATOR_TWL4030=y

arch/arm/configs/mxs_defconfig

+3 −11
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ CONFIG_INET=y 
CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=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_CAN=m
@@ -45,7 +42,6 @@ CONFIG_MTD=y 
CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SST25L=y

CONFIG_MTD_RAW_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y
@@ -60,7 +56,6 @@ CONFIG_ENC28J60=y 
CONFIG_ICPLUS_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_REALTEK_PHY=y

CONFIG_SMSC_PHY=y

CONFIG_CAN_FLEXCAN=m

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC95XX=y
@@ -69,21 +64,22 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_EDT_FT5X06=y

CONFIG_TOUCHSCREEN_MXS_LRADC=y

CONFIG_TOUCHSCREEN_TSC2007=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_PWM_BEEPER=y

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_MXS_AUART=y

# CONFIG_HW_RANDOM is not set

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MXS=y

CONFIG_SPI=y

CONFIG_SPI_GPIO=m

CONFIG_SPI_MXS=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_STMP3XXX_RTC_WATCHDOG=y
@@ -138,10 +134,6 @@ CONFIG_PWM_MXS=y 
CONFIG_NVMEM_MXS_OCOTP=y

CONFIG_EXT4_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_NETFS_SUPPORT=m

CONFIG_FSCACHE=y

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=m

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

arch/arm/configs/omap2plus_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_CPCAP_PWRBUTTON=m

CONFIG_INPUT_TPS65218_PWRBUTTON=m

CONFIG_INPUT_TPS65219_PWRBUTTON=m

CONFIG_INPUT_TWL4030_PWRBUTTON=m

CONFIG_INPUT_UINPUT=m

CONFIG_INPUT_PALMAS_PWRBUTTON=m
@@ -454,6 +455,7 @@ CONFIG_MFD_TPS65217=y 
CONFIG_MFD_TI_LP873X=y

CONFIG_MFD_TI_LP87565=y

CONFIG_MFD_TPS65218=y

CONFIG_MFD_TPS65219=y

CONFIG_MFD_TPS65910=y

CONFIG_TWL6040_CORE=y

CONFIG_REGULATOR_CPCAP=y
@@ -470,6 +472,7 @@ CONFIG_REGULATOR_TPS65023=y 
CONFIG_REGULATOR_TPS6507X=y

CONFIG_REGULATOR_TPS65217=y

CONFIG_REGULATOR_TPS65218=y

CONFIG_REGULATOR_TPS65219=y

CONFIG_REGULATOR_TPS65910=y

CONFIG_REGULATOR_TWL4030=y

CONFIG_RC_CORE=m

arch/arm/configs/sama5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ CONFIG_LIBERTAS_THINFIRM_USB=m 
CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_MWIFIEX_USB=m

CONFIG_WILC1000_SDIO=m

CONFIG_RT2X00=m

CONFIG_RT2500USB=m

CONFIG_RT73USB=m