| Message ID | 691e24d1c45a4b56b57ce1e02a04268c4253a77d.1602838910.git.zong.li@sifive.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | clk: add driver for the SiFive FU740 | expand |
Quoting Zong Li (2020-10-16 02:18:24) > Use generic name CLK_SIFIVE_PRCI instead of CLK_SIFIVE_FU540_PRCI. This > patch is prepared for fu740 support. > > Signed-off-by: Zong Li <zong.li@sifive.com> > --- Looks ok but needs an ack from riscv maintainers to go through clk tree. I was worried it would break defconfigs but it seems that the arch selects the config so this should be OK, right? > arch/riscv/Kconfig.socs | 2 +- > drivers/clk/sifive/Kconfig | 6 +++--- > drivers/clk/sifive/Makefile | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > index 8a55f6156661..3284d5c291be 100644 > --- a/arch/riscv/Kconfig.socs > +++ b/arch/riscv/Kconfig.socs > @@ -5,7 +5,7 @@ config SOC_SIFIVE > select SERIAL_SIFIVE if TTY > select SERIAL_SIFIVE_CONSOLE if TTY > select CLK_SIFIVE > - select CLK_SIFIVE_FU540_PRCI > + select CLK_SIFIVE_PRCI > select SIFIVE_PLIC > help > This enables support for SiFive SoC platform hardware.
On Thu, Nov 5, 2020 at 10:46 AM Stephen Boyd <sboyd@kernel.org> wrote: > > Quoting Zong Li (2020-10-16 02:18:24) > > Use generic name CLK_SIFIVE_PRCI instead of CLK_SIFIVE_FU540_PRCI. This > > patch is prepared for fu740 support. > > > > Signed-off-by: Zong Li <zong.li@sifive.com> > > --- > > Looks ok but needs an ack from riscv maintainers to go through clk > tree. I was worried it would break defconfigs but it seems that the arch > selects the config so this should be OK, right? Yes, this config is selected by arch, the defconfig won't be impacted. > > > arch/riscv/Kconfig.socs | 2 +- > > drivers/clk/sifive/Kconfig | 6 +++--- > > drivers/clk/sifive/Makefile | 2 +- > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > > index 8a55f6156661..3284d5c291be 100644 > > --- a/arch/riscv/Kconfig.socs > > +++ b/arch/riscv/Kconfig.socs > > @@ -5,7 +5,7 @@ config SOC_SIFIVE > > select SERIAL_SIFIVE if TTY > > select SERIAL_SIFIVE_CONSOLE if TTY > > select CLK_SIFIVE > > - select CLK_SIFIVE_FU540_PRCI > > + select CLK_SIFIVE_PRCI > > select SIFIVE_PLIC > > help > > This enables support for SiFive SoC platform hardware.
On Wed, 04 Nov 2020 18:46:56 PST (-0800), sboyd@kernel.org wrote: > Quoting Zong Li (2020-10-16 02:18:24) >> Use generic name CLK_SIFIVE_PRCI instead of CLK_SIFIVE_FU540_PRCI. This >> patch is prepared for fu740 support. >> >> Signed-off-by: Zong Li <zong.li@sifive.com> >> --- > > Looks ok but needs an ack from riscv maintainers to go through clk > tree. I was worried it would break defconfigs but it seems that the arch > selects the config so this should be OK, right? Ya, looks fine. TBH the whole Kconfig.socs thing was probably a mistake, but at least in this case it makes things easy. I was going to suggest spliting the Kconfigs out so there's a _FU540_PRCI and an _FU740_PRCI, but looking at the code it doesn't really seem to buy us much -- just that one offset table we could toss. Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com> Acked-by: Palmer Dabbelt <palmerdabbelt@google.com> >> arch/riscv/Kconfig.socs | 2 +- >> drivers/clk/sifive/Kconfig | 6 +++--- >> drivers/clk/sifive/Makefile | 2 +- >> 3 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs >> index 8a55f6156661..3284d5c291be 100644 >> --- a/arch/riscv/Kconfig.socs >> +++ b/arch/riscv/Kconfig.socs >> @@ -5,7 +5,7 @@ config SOC_SIFIVE >> select SERIAL_SIFIVE if TTY >> select SERIAL_SIFIVE_CONSOLE if TTY >> select CLK_SIFIVE >> - select CLK_SIFIVE_FU540_PRCI >> + select CLK_SIFIVE_PRCI >> select SIFIVE_PLIC >> help >> This enables support for SiFive SoC platform hardware.
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 8a55f6156661..3284d5c291be 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -5,7 +5,7 @@ config SOC_SIFIVE select SERIAL_SIFIVE if TTY select SERIAL_SIFIVE_CONSOLE if TTY select CLK_SIFIVE - select CLK_SIFIVE_FU540_PRCI + select CLK_SIFIVE_PRCI select SIFIVE_PLIC help This enables support for SiFive SoC platform hardware. diff --git a/drivers/clk/sifive/Kconfig b/drivers/clk/sifive/Kconfig index f3b4eb9cb0f5..ab48cf7e0105 100644 --- a/drivers/clk/sifive/Kconfig +++ b/drivers/clk/sifive/Kconfig @@ -8,12 +8,12 @@ menuconfig CLK_SIFIVE if CLK_SIFIVE -config CLK_SIFIVE_FU540_PRCI - bool "PRCI driver for SiFive FU540 SoCs" +config CLK_SIFIVE_PRCI + bool "PRCI driver for SiFive SoCs" select CLK_ANALOGBITS_WRPLL_CLN28HPC help Supports the Power Reset Clock interface (PRCI) IP block found in - FU540 SoCs. If this kernel is meant to run on a SiFive FU540 SoC, + FU540 SoCs. If this kernel is meant to run on a SiFive FU540 SoC, enable this driver. endif diff --git a/drivers/clk/sifive/Makefile b/drivers/clk/sifive/Makefile index 627effe2ece1..fe3e2cb4c4d8 100644 --- a/drivers/clk/sifive/Makefile +++ b/drivers/clk/sifive/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += sifive-prci.o -obj-$(CONFIG_CLK_SIFIVE_FU540_PRCI) += fu540-prci.o +obj-$(CONFIG_CLK_SIFIVE_PRCI) += fu540-prci.o
Use generic name CLK_SIFIVE_PRCI instead of CLK_SIFIVE_FU540_PRCI. This patch is prepared for fu740 support. Signed-off-by: Zong Li <zong.li@sifive.com> --- arch/riscv/Kconfig.socs | 2 +- drivers/clk/sifive/Kconfig | 6 +++--- drivers/clk/sifive/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)