On Fri, Sep 30, 2022 at 08:23:18PM +0800, Hal Feng wrote: > Add Kconfig options to select the specified StarFive SoC. Select > necessary Kconfig options required by the specified SoC for booting. > > Signed-off-by: Hal Feng <hal.feng@xxxxxxxxxxxxxxxxxxxxxx> > --- > arch/riscv/Kconfig.socs | 27 ++++++++++++++++++++++++++- > arch/riscv/boot/dts/starfive/Makefile | 4 ++-- > drivers/clk/starfive/Kconfig | 14 ++++++-------- > drivers/pinctrl/starfive/Kconfig | 6 ++---- > drivers/reset/Kconfig | 1 - Firstly, you cannot change all of these files in one commit, sorry. > 5 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > index 10f68a4359f9..321c448e7b6f 100644 > --- a/arch/riscv/Kconfig.socs > +++ b/arch/riscv/Kconfig.socs > @@ -22,10 +22,35 @@ config SOC_STARFIVE > bool "StarFive SoCs" > select PINCTRL > select RESET_CONTROLLER > + select RESET_STARFIVE Secondly, we are trying to get rid of selects in arch/riscv at the moment, not add them. use "default SOC_STARFIVE" in drivers/reset/kconfig instead please. > + help > + This enables support for StarFive SoC platform hardware. > + > +if SOC_STARFIVE I don't think we want to have per soc selection menus in arch code, I think this should move to drivers/soc (a la Renesas) if you want to have a per soc selection menu or else just do "default SOC_STARFIVE" for both clock and pinctrl drivers in the clk and pinctrl Kconfig entries. Thanks, Conor. > + > +config SOC_JH7100 > + bool "StarFive JH7100 SoC support" > + depends on SOC_STARFIVE > select SIFIVE_L2 > select SIFIVE_PLIC > + select CLK_STARFIVE_JH7100 > + select PINCTRL_STARFIVE_JH7100 > + default SOC_STARFIVE > help > - This enables support for StarFive SoC platform hardware. > + This enables support for StarFive JH7100 SoC. > + > +config SOC_JH7110 > + bool "StarFive JH7110 SoC support" > + depends on SOC_STARFIVE > + select SIFIVE_L2 > + select SIFIVE_PLIC > + select CLK_STARFIVE_JH7110_SYS > + select PINCTRL_STARFIVE_JH7110 > + default SOC_STARFIVE > + help > + This enables support for StarFive JH7110 SoC. > + > +endif > > config SOC_VIRT > bool "QEMU Virt Machine" > diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile > index e1237dbc6aac..a6ecd3c2ec7d 100644 > --- a/arch/riscv/boot/dts/starfive/Makefile > +++ b/arch/riscv/boot/dts/starfive/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0 > -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb > -dtb-$(CONFIG_SOC_STARFIVE) += jh7110-starfive-visionfive-v2.dtb > +dtb-$(CONFIG_SOC_JH7100) += jh7100-beaglev-starlight.dtb > +dtb-$(CONFIG_SOC_JH7110) += jh7110-starfive-visionfive-v2.dtb > diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig > index 42aad3b553cb..d0490e9f42db 100644 > --- a/drivers/clk/starfive/Kconfig > +++ b/drivers/clk/starfive/Kconfig > @@ -5,36 +5,34 @@ config CLK_STARFIVE > > config CLK_STARFIVE_JH7100 > bool "StarFive JH7100 clock support" > - depends on SOC_STARFIVE || COMPILE_TEST > + depends on SOC_JH7100 || COMPILE_TEST > select CLK_STARFIVE > - default SOC_STARFIVE > help > Say yes here to support the clock controller on the StarFive JH7100 > SoC. > > config CLK_STARFIVE_JH7100_AUDIO > tristate "StarFive JH7100 audio clock support" > - depends on SOC_STARFIVE || COMPILE_TEST > + depends on SOC_JH7100 || COMPILE_TEST > select CLK_STARFIVE > - default m if SOC_STARFIVE > + default m if SOC_JH7100 > help > Say Y or M here to support the audio clocks on the StarFive JH7100 > SoC. > > config CLK_STARFIVE_JH7110_SYS > bool "StarFive JH7110 system clock support" > - depends on SOC_STARFIVE || COMPILE_TEST > + depends on SOC_JH7110 || COMPILE_TEST > select CLK_STARFIVE > - default SOC_STARFIVE > help > Say yes here to support the system clock controller on the > StarFive JH7110 SoC. > > config CLK_STARFIVE_JH7110_AON > tristate "StarFive JH7110 always-on clock support" > - depends on SOC_STARFIVE || COMPILE_TEST > + depends on SOC_JH7110 || COMPILE_TEST > select CLK_STARFIVE > - default m if SOC_STARFIVE > + default m if SOC_JH7110 > help > Say yes here to support the always-on clock controller on the > StarFive JH7110 SoC. > diff --git a/drivers/pinctrl/starfive/Kconfig b/drivers/pinctrl/starfive/Kconfig > index fde39f4a7922..d09bdf6d3029 100644 > --- a/drivers/pinctrl/starfive/Kconfig > +++ b/drivers/pinctrl/starfive/Kconfig > @@ -2,7 +2,7 @@ > > config PINCTRL_STARFIVE_JH7100 > tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC" > - depends on SOC_STARFIVE || COMPILE_TEST > + depends on SOC_JH7100 || COMPILE_TEST > depends on OF > select GENERIC_PINCTRL_GROUPS > select GENERIC_PINMUX_FUNCTIONS > @@ -10,7 +10,6 @@ config PINCTRL_STARFIVE_JH7100 > select GPIOLIB > select GPIOLIB_IRQCHIP > select OF_GPIO > - default SOC_STARFIVE > help > Say yes here to support pin control on the StarFive JH7100 SoC. > This also provides an interface to the GPIO pins not used by other > @@ -28,10 +27,9 @@ config PINCTRL_STARFIVE > > config PINCTRL_STARFIVE_JH7110 > bool "Pinctrl and GPIO driver for the StarFive JH7110 SoC" > - depends on SOC_STARFIVE || COMPILE_TEST > + depends on SOC_JH7110 || COMPILE_TEST > depends on OF > select PINCTRL_STARFIVE > - default SOC_STARFIVE > help > Say yes here to support pin control on the StarFive JH7110 SoC. > This also provides an interface to the GPIO pins not used by other > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig > index 8121de5ecc3c..c001879bd890 100644 > --- a/drivers/reset/Kconfig > +++ b/drivers/reset/Kconfig > @@ -228,7 +228,6 @@ config RESET_SOCFPGA > config RESET_STARFIVE > bool "StarFive SoC Reset Driver" > depends on SOC_STARFIVE || COMPILE_TEST > - default SOC_STARFIVE > help > This enables the reset controller driver for the StarFive SoCs. > > -- > 2.17.1 >
