Unverified Commit 072c3547 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

 into soc/defconfig

RISC-V config for v6.18

Enable the MMP_PDMA driver as a module in defconfig builds, where it is
needed by Spacemit K1 boards. This depends on a savedefconfig reorder
that it'd otherwise conflict with, so that's here too.

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

* tag 'riscv-config-for-v6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  riscv: defconfig: Enable MMP_PDMA support for SpacemiT K1 SoC
  riscv: defconfig: run savedefconfig to reorder it

Link: https://lore.kernel.org/r/20250924-unenvied-armful-5fcc80c23d19@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2136c694 3df7ce0e

arch/riscv/configs/defconfig

+3 −3
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ CONFIG_MACB=y 
CONFIG_E1000E=y

CONFIG_R8169=y

CONFIG_STMMAC_ETH=m

CONFIG_DWMAC_THEAD=m

CONFIG_MICREL_PHY=y

CONFIG_MICROSEMI_PHY=y

CONFIG_MOTORCOMM_PHY=y
@@ -152,7 +153,6 @@ CONFIG_HW_RANDOM_JH7110=m 
CONFIG_I2C=y

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_DESIGNWARE_CORE=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_MV64XXX=m

CONFIG_SPI=y

CONFIG_SPI_CADENCE_QUADSPI=m
@@ -160,11 +160,11 @@ CONFIG_SPI_PL022=m 
CONFIG_SPI_SIFIVE=y

CONFIG_SPI_SUN6I=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_PINCTRL_TH1520=y

CONFIG_PINCTRL_SOPHGO_CV1800B=y

CONFIG_PINCTRL_SOPHGO_CV1812H=y

CONFIG_PINCTRL_SOPHGO_SG2000=y

CONFIG_PINCTRL_SOPHGO_SG2002=y

CONFIG_PINCTRL_TH1520=y

CONFIG_GPIO_DWAPB=y

CONFIG_GPIO_SIFIVE=y

CONFIG_GPIO_SPACEMIT_K1=y
@@ -241,7 +241,7 @@ CONFIG_RTC_DRV_SUN6I=y 
CONFIG_DMADEVICES=y

CONFIG_DMA_SUN6I=m

CONFIG_DW_AXI_DMAC=y

CONFIG_DWMAC_THEAD=m

CONFIG_MMP_PDMA=m

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BALLOON=y

CONFIG_VIRTIO_INPUT=y