Unverified Commit 8c25d964 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-config-for-v6.17' of... 

Merge tag 'riscv-config-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into soc/defconfig

RISC-V soc defconfig for v6.17

spacemit:
Enable sdhci and pwm drivers for the k1 soc in defconfig, the former as
a builtin and the latter a module.

starfive:
Remove a no-longer required config for the starfive sound driver.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>

* tag 'riscv-config-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  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

Link: https://lore.kernel.org/r/20250716-defrost-regime-20a55ed925ad@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c18b21c5 bd4d5d3f

arch/riscv/configs/defconfig

+3 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ CONFIG_SOUND=y 
CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_DESIGNWARE_I2S=m

CONFIG_SND_SOC_STARFIVE=m

CONFIG_SND_SOC_JH7110_PWMDAC=m

CONFIG_SND_SOC_JH7110_TDM=m

CONFIG_SND_SOC_WM8978=m
@@ -230,6 +229,7 @@ CONFIG_MMC=y 
CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_DWCMSHC=y

CONFIG_MMC_SDHCI_OF_K1=y

CONFIG_MMC_SDHCI_CADENCE=y

CONFIG_MMC_SPI=y

CONFIG_MMC_DW=y
@@ -258,6 +258,8 @@ CONFIG_RPMSG_CTRL=y 
CONFIG_RPMSG_VIRTIO=y

CONFIG_PM_DEVFREQ=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_PXA=m

CONFIG_THEAD_C900_ACLINT_SSWI=y

CONFIG_PHY_SUN4I_USB=m

CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m