| Message ID | 20230418123756.62495-2-hal.feng@starfivetech.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | A fix for StarFive JH7110 clock drivers | expand |
On Tue, 18 Apr 2023 20:37:56 +0800, Hal Feng wrote: > When (ARCH_STARFIVE [=n] && COMPILE_TEST [=y] && RESET_CONTROLLER [=n]), > RESET_STARFIVE_JH7110 can't be selected by CLK_STARFIVE_JH7110_SYS > and CLK_STARFIVE_JH7110_AON. > > Add a condition `if RESET_CONTROLLER` to fix it. Also, delete redundant > selected options of CLK_STARFIVE_JH7110_AON because these options are > already selected by the dependency. > > Fixes: edab7204afe5 ("clk: starfive: Add StarFive JH7110 system clock driver") > Fixes: b2ab3c94f41f ("clk: starfive: Add StarFive JH7110 always-on clock driver") > Signed-off-by: Hal Feng <hal.feng@starfivetech.com> Hi, Stephen, Could this patch be merged into v6.4? Thanks. Best regards, Hal > --- > drivers/clk/starfive/Kconfig | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig > index 71c1148ee5f6..5d2333106f13 100644 > --- a/drivers/clk/starfive/Kconfig > +++ b/drivers/clk/starfive/Kconfig > @@ -26,7 +26,7 @@ config CLK_STARFIVE_JH7110_SYS > depends on ARCH_STARFIVE || COMPILE_TEST > select AUXILIARY_BUS > select CLK_STARFIVE_JH71X0 > - select RESET_STARFIVE_JH7110 > + select RESET_STARFIVE_JH7110 if RESET_CONTROLLER > default ARCH_STARFIVE > help > Say yes here to support the system clock controller on the > @@ -35,9 +35,6 @@ config CLK_STARFIVE_JH7110_SYS > config CLK_STARFIVE_JH7110_AON > tristate "StarFive JH7110 always-on clock support" > depends on CLK_STARFIVE_JH7110_SYS > - select AUXILIARY_BUS > - select CLK_STARFIVE_JH71X0 > - select RESET_STARFIVE_JH7110 > default m if ARCH_STARFIVE > help > Say yes here to support the always-on clock controller on the
On Tue, Apr 25, 2023 at 07:53:04PM +0800, Hal Feng wrote: > On Tue, 18 Apr 2023 20:37:56 +0800, Hal Feng wrote: > > When (ARCH_STARFIVE [=n] && COMPILE_TEST [=y] && RESET_CONTROLLER [=n]), > > RESET_STARFIVE_JH7110 can't be selected by CLK_STARFIVE_JH7110_SYS > > and CLK_STARFIVE_JH7110_AON. > > > > Add a condition `if RESET_CONTROLLER` to fix it. Also, delete redundant > > selected options of CLK_STARFIVE_JH7110_AON because these options are > > already selected by the dependency. > > > > Fixes: edab7204afe5 ("clk: starfive: Add StarFive JH7110 system clock driver") > > Fixes: b2ab3c94f41f ("clk: starfive: Add StarFive JH7110 always-on clock driver") > > Signed-off-by: Hal Feng <hal.feng@starfivetech.com> > > Hi, Stephen, > > Could this patch be merged into v6.4? Thanks. Whoops, I thought I had replied to this a week ago. In case it helps, Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > > Best regards, > Hal > > > --- > > drivers/clk/starfive/Kconfig | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig > > index 71c1148ee5f6..5d2333106f13 100644 > > --- a/drivers/clk/starfive/Kconfig > > +++ b/drivers/clk/starfive/Kconfig > > @@ -26,7 +26,7 @@ config CLK_STARFIVE_JH7110_SYS > > depends on ARCH_STARFIVE || COMPILE_TEST > > select AUXILIARY_BUS > > select CLK_STARFIVE_JH71X0 > > - select RESET_STARFIVE_JH7110 > > + select RESET_STARFIVE_JH7110 if RESET_CONTROLLER > > default ARCH_STARFIVE > > help > > Say yes here to support the system clock controller on the > > @@ -35,9 +35,6 @@ config CLK_STARFIVE_JH7110_SYS > > config CLK_STARFIVE_JH7110_AON > > tristate "StarFive JH7110 always-on clock support" > > depends on CLK_STARFIVE_JH7110_SYS > > - select AUXILIARY_BUS > > - select CLK_STARFIVE_JH71X0 > > - select RESET_STARFIVE_JH7110 > > default m if ARCH_STARFIVE > > help > > Say yes here to support the always-on clock controller on the >
Quoting Hal Feng (2023-04-18 05:37:56) > When (ARCH_STARFIVE [=n] && COMPILE_TEST [=y] && RESET_CONTROLLER [=n]), > RESET_STARFIVE_JH7110 can't be selected by CLK_STARFIVE_JH7110_SYS > and CLK_STARFIVE_JH7110_AON. > > Add a condition `if RESET_CONTROLLER` to fix it. Also, delete redundant > selected options of CLK_STARFIVE_JH7110_AON because these options are > already selected by the dependency. > > Fixes: edab7204afe5 ("clk: starfive: Add StarFive JH7110 system clock driver") > Fixes: b2ab3c94f41f ("clk: starfive: Add StarFive JH7110 always-on clock driver") > Signed-off-by: Hal Feng <hal.feng@starfivetech.com> > --- Applied to clk-next
diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig index 71c1148ee5f6..5d2333106f13 100644 --- a/drivers/clk/starfive/Kconfig +++ b/drivers/clk/starfive/Kconfig @@ -26,7 +26,7 @@ config CLK_STARFIVE_JH7110_SYS depends on ARCH_STARFIVE || COMPILE_TEST select AUXILIARY_BUS select CLK_STARFIVE_JH71X0 - select RESET_STARFIVE_JH7110 + select RESET_STARFIVE_JH7110 if RESET_CONTROLLER default ARCH_STARFIVE help Say yes here to support the system clock controller on the @@ -35,9 +35,6 @@ config CLK_STARFIVE_JH7110_SYS config CLK_STARFIVE_JH7110_AON tristate "StarFive JH7110 always-on clock support" depends on CLK_STARFIVE_JH7110_SYS - select AUXILIARY_BUS - select CLK_STARFIVE_JH71X0 - select RESET_STARFIVE_JH7110 default m if ARCH_STARFIVE help Say yes here to support the always-on clock controller on the
When (ARCH_STARFIVE [=n] && COMPILE_TEST [=y] && RESET_CONTROLLER [=n]), RESET_STARFIVE_JH7110 can't be selected by CLK_STARFIVE_JH7110_SYS and CLK_STARFIVE_JH7110_AON. Add a condition `if RESET_CONTROLLER` to fix it. Also, delete redundant selected options of CLK_STARFIVE_JH7110_AON because these options are already selected by the dependency. Fixes: edab7204afe5 ("clk: starfive: Add StarFive JH7110 system clock driver") Fixes: b2ab3c94f41f ("clk: starfive: Add StarFive JH7110 always-on clock driver") Signed-off-by: Hal Feng <hal.feng@starfivetech.com> --- drivers/clk/starfive/Kconfig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)