| Message ID | 20210310083840.481615-3-krzysztof.kozlowski@canonical.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64 / clk: socfpga: simplifying, cleanups and compile testing | expand |
On Wed, Mar 10, 2021 at 9:38 AM Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> wrote: > --- a/drivers/clk/socfpga/Kconfig > +++ b/drivers/clk/socfpga/Kconfig > @@ -1,6 +1,17 @@ > # SPDX-License-Identifier: GPL-2.0 > +config COMMON_CLK_SOCFPGA > + bool "Intel SoCFPGA family clock support" if COMPILE_TEST && !ARCH_SOCFPGA && !ARCH_SOCFPGA64 > + depends on ARCH_SOCFPGA || ARCH_SOCFPGA64 || COMPILE_TEST > + default y if ARCH_SOCFPGA || ARCH_SOCFPGA64 I think the 'depends on' line here is redundant if you also have the 'if' line and the default. Arnd
On 10/03/2021 17:48, Arnd Bergmann wrote: > On Wed, Mar 10, 2021 at 9:38 AM Krzysztof Kozlowski > <krzysztof.kozlowski@canonical.com> wrote: >> --- a/drivers/clk/socfpga/Kconfig >> +++ b/drivers/clk/socfpga/Kconfig >> @@ -1,6 +1,17 @@ >> # SPDX-License-Identifier: GPL-2.0 >> +config COMMON_CLK_SOCFPGA >> + bool "Intel SoCFPGA family clock support" if COMPILE_TEST && !ARCH_SOCFPGA && !ARCH_SOCFPGA64 >> + depends on ARCH_SOCFPGA || ARCH_SOCFPGA64 || COMPILE_TEST >> + default y if ARCH_SOCFPGA || ARCH_SOCFPGA64 > > I think the 'depends on' line here is redundant if you also have the > 'if' line and the default. Yes, you're right. Best regards, Krzysztof
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index e34457539edf..9b582b3fca34 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -104,10 +104,7 @@ obj-y += renesas/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/ obj-$(CONFIG_CLK_SIFIVE) += sifive/ -obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ -obj-$(CONFIG_ARCH_AGILEX) += socfpga/ -obj-$(CONFIG_ARCH_N5X) += socfpga/ -obj-$(CONFIG_ARCH_SOCFPGA64) += socfpga/ +obj-y += socfpga/ obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-y += sprd/ obj-$(CONFIG_ARCH_STI) += st/ diff --git a/drivers/clk/socfpga/Kconfig b/drivers/clk/socfpga/Kconfig index 834797c68cb2..fb93b7cede27 100644 --- a/drivers/clk/socfpga/Kconfig +++ b/drivers/clk/socfpga/Kconfig @@ -1,6 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 +config COMMON_CLK_SOCFPGA + bool "Intel SoCFPGA family clock support" if COMPILE_TEST && !ARCH_SOCFPGA && !ARCH_SOCFPGA64 + depends on ARCH_SOCFPGA || ARCH_SOCFPGA64 || COMPILE_TEST + default y if ARCH_SOCFPGA || ARCH_SOCFPGA64 + help + Support for the clock controllers present on Intel SoCFPGA and eASIC + devices like Stratix 10, Agilex and N5X eASIC. + +if COMMON_CLK_SOCFPGA + config COMMON_CLK_SOCFPGA64 - bool - # Intel Stratix / Agilex / N5X clock controller support + bool "Intel Stratix / Agilex / N5X clock controller support" if COMPILE_TEST && !ARCH_SOCFPGA64 default y if ARCH_SOCFPGA64 - depends on ARCH_SOCFPGA64 + depends on ARCH_SOCFPGA64 || COMPILE_TEST + +endif # COMMON_CLK_SOCFPGA
The Stratix 10 / Agilex / N5X clocks do not use anything other than OF or COMMON_CLK so they should be compile testable on most of the platforms. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/clk/Makefile | 5 +---- drivers/clk/socfpga/Kconfig | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-)