Skip to content

Commit 3c557d0

Browse files
committed
Merge tag 'riscv-config-for-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/defconfig
RISC-V config for v6.12 Two patches, enabling clock and pinctrl support in defconfig for Sopghgo devices. Signed-off-by: Conor Dooley <[email protected]> * tag 'riscv-config-for-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: riscv: defconfig: Enable pinctrl support for CV18XX Series SoC riscv: defconfig: sophgo: enable clks for sg2042 Link: https://lore.kernel.org/r/20240910-annex-ravage-07d63041a7c5@spud Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e4a8281 + 72160ec commit 3c557d0

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/riscv/configs/defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ CONFIG_SPI_RSPI=m
167167
CONFIG_SPI_SIFIVE=y
168168
CONFIG_SPI_SUN6I=y
169169
# CONFIG_PTP_1588_CLOCK is not set
170+
CONFIG_PINCTRL_SOPHGO_CV1800B=y
171+
CONFIG_PINCTRL_SOPHGO_CV1812H=y
172+
CONFIG_PINCTRL_SOPHGO_SG2000=y
173+
CONFIG_PINCTRL_SOPHGO_SG2002=y
170174
CONFIG_GPIO_SIFIVE=y
171175
CONFIG_POWER_RESET_GPIO_RESTART=y
172176
CONFIG_SENSORS_SFCTEMP=m
@@ -249,6 +253,9 @@ CONFIG_VIRTIO_BALLOON=y
249253
CONFIG_VIRTIO_INPUT=y
250254
CONFIG_VIRTIO_MMIO=y
251255
CONFIG_CLK_SOPHGO_CV1800=y
256+
CONFIG_CLK_SOPHGO_SG2042_PLL=y
257+
CONFIG_CLK_SOPHGO_SG2042_CLKGEN=y
258+
CONFIG_CLK_SOPHGO_SG2042_RPGATE=y
252259
CONFIG_SUN8I_DE2_CCU=m
253260
CONFIG_RENESAS_OSTM=y
254261
CONFIG_SUN50I_IOMMU=y

0 commit comments

Comments
 (0)