2023-04-01 11:20:44

by Hal Feng

Subject: [PATCH v7 03/22] clk: starfive: Replace SOC_STARFIVE with ARCH_STARFIVE

Using ARCH_FOO symbol is preferred than SOC_FOO.
Set obj-y for starfive/ in Makefile, so the StarFive drivers
can be compiled with COMPILE_TEST=y but ARCH_STARFIVE=n.

Reviewed-by: Conor Dooley <[email protected]>
Signed-off-by: Hal Feng <[email protected]>
---
drivers/clk/Makefile | 2 +-
drivers/clk/starfive/Kconfig | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index e3ca0d058a25..3bed88d67a3a 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -117,7 +117,7 @@ obj-$(CONFIG_PLAT_SPEAR) += spear/
obj-y += sprd/
obj-$(CONFIG_ARCH_STI) += st/
obj-$(CONFIG_ARCH_STM32) += stm32/
-obj-$(CONFIG_SOC_STARFIVE) += starfive/
+obj-y += starfive/
obj-$(CONFIG_ARCH_SUNXI) += sunxi/
obj-y += sunxi-ng/
obj-$(CONFIG_ARCH_TEGRA) += tegra/
diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig
index 003bd2d56ce7..ef3517f4a276 100644
--- a/drivers/clk/starfive/Kconfig
+++ b/drivers/clk/starfive/Kconfig
@@ -2,8 +2,8 @@

config CLK_STARFIVE_JH7100
bool "StarFive JH7100 clock support"
- depends on SOC_STARFIVE || COMPILE_TEST
- default SOC_STARFIVE
+ depends on ARCH_STARFIVE || COMPILE_TEST
+ default ARCH_STARFIVE
help
Say yes here to support the clock controller on the StarFive JH7100
SoC.
@@ -11,7 +11,7 @@ config CLK_STARFIVE_JH7100
config CLK_STARFIVE_JH7100_AUDIO
tristate "StarFive JH7100 audio clock support"
depends on CLK_STARFIVE_JH7100
- default m if SOC_STARFIVE
+ default m if ARCH_STARFIVE
help
Say Y or M here to support the audio clocks on the StarFive JH7100
SoC.
--
2.38.1

2023-04-05 11:49:38

by Heiko Stübner

Subject: Re: [PATCH v7 03/22] clk: starfive: Replace SOC_STARFIVE with ARCH_STARFIVE

Am Samstag, 1. April 2023, 13:19:15 CEST schrieb Hal Feng:
> Using ARCH_FOO symbol is preferred than SOC_FOO.
> Set obj-y for starfive/ in Makefile, so the StarFive drivers
> can be compiled with COMPILE_TEST=y but ARCH_STARFIVE=n.
>
> Reviewed-by: Conor Dooley <[email protected]>
> Signed-off-by: Hal Feng <[email protected]>

Reviewed-by: Heiko Stuebner <[email protected]>

> ---
> drivers/clk/Makefile | 2 +-
> drivers/clk/starfive/Kconfig | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index e3ca0d058a25..3bed88d67a3a 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -117,7 +117,7 @@ obj-$(CONFIG_PLAT_SPEAR) += spear/
> obj-y += sprd/
> obj-$(CONFIG_ARCH_STI) += st/
> obj-$(CONFIG_ARCH_STM32) += stm32/
> -obj-$(CONFIG_SOC_STARFIVE) += starfive/
> +obj-y += starfive/
> obj-$(CONFIG_ARCH_SUNXI) += sunxi/
> obj-y += sunxi-ng/
> obj-$(CONFIG_ARCH_TEGRA) += tegra/
> diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig
> index 003bd2d56ce7..ef3517f4a276 100644
> --- a/drivers/clk/starfive/Kconfig
> +++ b/drivers/clk/starfive/Kconfig
> @@ -2,8 +2,8 @@
>
> config CLK_STARFIVE_JH7100
> bool "StarFive JH7100 clock support"
> - depends on SOC_STARFIVE || COMPILE_TEST
> - default SOC_STARFIVE
> + depends on ARCH_STARFIVE || COMPILE_TEST
> + default ARCH_STARFIVE
> help
> Say yes here to support the clock controller on the StarFive JH7100
> SoC.
> @@ -11,7 +11,7 @@ config CLK_STARFIVE_JH7100
> config CLK_STARFIVE_JH7100_AUDIO
> tristate "StarFive JH7100 audio clock support"
> depends on CLK_STARFIVE_JH7100
> - default m if SOC_STARFIVE
> + default m if ARCH_STARFIVE
> help
> Say Y or M here to support the audio clocks on the StarFive JH7100
> SoC.
>