Skip to content

Commit 8c25d96

Browse files
committed
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: Conor Dooley <[email protected]> * 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: Arnd Bergmann <[email protected]>
2 parents c18b21c + bd4d5d3 commit 8c25d96

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/riscv/configs/defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ CONFIG_SOUND=y
191191
CONFIG_SND=y
192192
CONFIG_SND_SOC=y
193193
CONFIG_SND_DESIGNWARE_I2S=m
194-
CONFIG_SND_SOC_STARFIVE=m
195194
CONFIG_SND_SOC_JH7110_PWMDAC=m
196195
CONFIG_SND_SOC_JH7110_TDM=m
197196
CONFIG_SND_SOC_WM8978=m
@@ -230,6 +229,7 @@ CONFIG_MMC=y
230229
CONFIG_MMC_SDHCI=y
231230
CONFIG_MMC_SDHCI_PLTFM=y
232231
CONFIG_MMC_SDHCI_OF_DWCMSHC=y
232+
CONFIG_MMC_SDHCI_OF_K1=y
233233
CONFIG_MMC_SDHCI_CADENCE=y
234234
CONFIG_MMC_SPI=y
235235
CONFIG_MMC_DW=y
@@ -258,6 +258,8 @@ CONFIG_RPMSG_CTRL=y
258258
CONFIG_RPMSG_VIRTIO=y
259259
CONFIG_PM_DEVFREQ=y
260260
CONFIG_IIO=y
261+
CONFIG_PWM=y
262+
CONFIG_PWM_PXA=m
261263
CONFIG_THEAD_C900_ACLINT_SSWI=y
262264
CONFIG_PHY_SUN4I_USB=m
263265
CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m

0 commit comments

Comments
 (0)