This series fix some issues of StarFive JH7110 sys and aon clock drivers.
The first patch fix two issues [1] [2] reported by kernel test robot.
The second patch is accepted in v1 so drop it in v2.
[1] https://lore.kernel.org/oe-kbuild-all/[email protected]/
[2] https://lore.kernel.org/oe-kbuild-all/[email protected]/
Changes since v1:
- Drop patch 2 since it is accepted.
- Change `select RESET_STARFIVE_JH7110 if ARCH_STARFIVE` to
`select RESET_STARFIVE_JH7110 if RESET_CONTROLLER`.
- Change the commit message accordingly.
---
History:
v1: https://lore.kernel.org/all/[email protected]/
Hal Feng (1):
clk: starfive: Fix RESET_STARFIVE_JH7110 can't be selected in a
specified case
drivers/clk/starfive/Kconfig | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--
2.38.1
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 <[email protected]>
---
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
--
2.38.1
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 <[email protected]>
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
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 <[email protected]>
> ---
Applied to clk-next