Skip to content

Commit 74b1d17

Browse files
committed
Merge tag 'riscv-config-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/defconfig
RISC-V config for v6.16 PM_GENERIC_DOMAINS is enabled because T-Head SoCs need to use it and spacemit's gpio and clock controller are enabled for more obvious reasons. Signed-off-by: Conor Dooley <[email protected]> * tag 'riscv-config-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: riscv: defconfig: spacemit: enable clock controller driver for SpacemiT K1 riscv: defconfig: spacemit: enable gpio support for K1 SoC riscv: Enable PM_GENERIC_DOMAINS for T-Head SoCs Link: https://lore.kernel.org/r/20250516-joystick-mortified-385820b1ad0b@spud Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 93b0758 + 60c6d37 commit 74b1d17

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/riscv/Kconfig.socs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ config ARCH_THEAD
5454
bool "T-HEAD RISC-V SoCs"
5555
depends on MMU && !XIP_KERNEL
5656
select ERRATA_THEAD
57+
select PM_GENERIC_DOMAINS if PM
5758
help
5859
This enables support for the RISC-V based T-HEAD SoCs.
5960

arch/riscv/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ CONFIG_PINCTRL_SOPHGO_SG2002=y
169169
CONFIG_PINCTRL_TH1520=y
170170
CONFIG_GPIO_DWAPB=y
171171
CONFIG_GPIO_SIFIVE=y
172+
CONFIG_GPIO_SPACEMIT_K1=y
172173
CONFIG_POWER_RESET_GPIO_RESTART=y
173174
CONFIG_SENSORS_SFCTEMP=m
174175
CONFIG_CPU_THERMAL=y
@@ -250,6 +251,8 @@ CONFIG_CLK_SOPHGO_CV1800=y
250251
CONFIG_CLK_SOPHGO_SG2042_PLL=y
251252
CONFIG_CLK_SOPHGO_SG2042_CLKGEN=y
252253
CONFIG_CLK_SOPHGO_SG2042_RPGATE=y
254+
CONFIG_SPACEMIT_CCU=y
255+
CONFIG_SPACEMIT_K1_CCU=y
253256
CONFIG_SUN8I_DE2_CCU=m
254257
CONFIG_SUN50I_IOMMU=y
255258
CONFIG_RPMSG_CHAR=y

0 commit comments

Comments
 (0)