linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] clk: versatile: undo some dependency changes
@ 2020-05-27 13:40 Arnd Bergmann
  2020-05-28  0:34 ` Stephen Boyd
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2020-05-27 13:40 UTC (permalink / raw)
  To: Linus Walleij, Michael Turquette, Stephen Boyd
  Cc: Arnd Bergmann, Rob Herring, Sudeep Holla, linux-arm-kernel,
	linux-clk, linux-kernel

SP810 and ICST are selected by a couple of platforms, most but
not all in the versatile family:

WARNING: unmet direct dependencies detected for CLK_SP810
  Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_VERSATILE [=n]
  Selected by [y]:
  - ARCH_REALVIEW [=y] && (ARCH_MULTI_V5 [=n] || ARCH_MULTI_V6 [=n] ||
ARCH_MULTI_V7 [=y])

WARNING: unmet direct dependencies detected for ICST
  Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_VERSATILE [=n]
  Selected by [y]:
  - ARCH_REALVIEW [=y] && (ARCH_MULTI_V5 [=n] || ARCH_MULTI_V6 [=n] || ARCH_MULTI_V7 [=y])
  - ARCH_VEXPRESS [=y] && ARCH_MULTI_V7 [=y]
  - ARCH_ZYNQ [=y] && ARCH_MULTI_V7 [=y]

Change back the Kconfig logic to allow these to be selected
without the main option.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/clk/versatile/Kconfig | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig
index a0ed412e8396..a557886d813e 100644
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -7,6 +7,18 @@ menuconfig COMMON_CLK_VERSATILE
 
 if COMMON_CLK_VERSATILE
 
+config CLK_VEXPRESS_OSC
+	tristate "Clock driver for Versatile Express OSC clock generators"
+	depends on VEXPRESS_CONFIG
+	select REGMAP_MMIO
+	default y if ARCH_VEXPRESS
+	---help---
+	  Simple regmap-based driver driving clock generators on Versatile
+	  Express platforms hidden behind its configuration infrastructure,
+	  commonly known as OSCs.
+
+endif
+
 config ICST
 	bool "Clock driver for ARM Reference designs ICST"
 	select REGMAP_MMIO
@@ -22,14 +34,4 @@ config CLK_SP810
 	  Supports clock muxing (REFCLK/TIMCLK to TIMERCLKEN0-3) capabilities
 	  of the ARM SP810 System Controller cell.
 
-config CLK_VEXPRESS_OSC
-	tristate "Clock driver for Versatile Express OSC clock generators"
-	depends on VEXPRESS_CONFIG
-	select REGMAP_MMIO
-	default y if ARCH_VEXPRESS
-	---help---
-	  Simple regmap-based driver driving clock generators on Versatile
-	  Express platforms hidden behind its configuration infrastructure,
-	  commonly known as OSCs.
 
-endif
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] clk: versatile: undo some dependency changes
  2020-05-27 13:40 [PATCH] clk: versatile: undo some dependency changes Arnd Bergmann
@ 2020-05-28  0:34 ` Stephen Boyd
  2020-05-28  9:08   ` Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2020-05-28  0:34 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Michael Turquette
  Cc: Arnd Bergmann, Rob Herring, Sudeep Holla, linux-arm-kernel,
	linux-clk, linux-kernel

Quoting Arnd Bergmann (2020-05-27 06:40:33)
> SP810 and ICST are selected by a couple of platforms, most but
> not all in the versatile family:
> 
> WARNING: unmet direct dependencies detected for CLK_SP810
>   Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_VERSATILE [=n]
>   Selected by [y]:
>   - ARCH_REALVIEW [=y] && (ARCH_MULTI_V5 [=n] || ARCH_MULTI_V6 [=n] ||
> ARCH_MULTI_V7 [=y])
> 
> WARNING: unmet direct dependencies detected for ICST
>   Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_VERSATILE [=n]
>   Selected by [y]:
>   - ARCH_REALVIEW [=y] && (ARCH_MULTI_V5 [=n] || ARCH_MULTI_V6 [=n] || ARCH_MULTI_V7 [=y])
>   - ARCH_VEXPRESS [=y] && ARCH_MULTI_V7 [=y]
>   - ARCH_ZYNQ [=y] && ARCH_MULTI_V7 [=y]
> 
> Change back the Kconfig logic to allow these to be selected
> without the main option.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

Is this similar to
https://lore.kernel.org/r/20200527181307.2482167-1-robh@kernel.org
?

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] clk: versatile: undo some dependency changes
  2020-05-28  0:34 ` Stephen Boyd
@ 2020-05-28  9:08   ` Arnd Bergmann
  0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2020-05-28  9:08 UTC (permalink / raw)
  To: Stephen Boyd
  Cc: Linus Walleij, Michael Turquette, Rob Herring, Sudeep Holla,
	Linux ARM, linux-clk, linux-kernel

On Thu, May 28, 2020 at 2:34 AM Stephen Boyd <sboyd@kernel.org> wrote:
>
> Quoting Arnd Bergmann (2020-05-27 06:40:33)
> > SP810 and ICST are selected by a couple of platforms, most but
> > not all in the versatile family:
> >
> > WARNING: unmet direct dependencies detected for CLK_SP810
> >   Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_VERSATILE [=n]
> >   Selected by [y]:
> >   - ARCH_REALVIEW [=y] && (ARCH_MULTI_V5 [=n] || ARCH_MULTI_V6 [=n] ||
> > ARCH_MULTI_V7 [=y])
> >
> > WARNING: unmet direct dependencies detected for ICST
> >   Depends on [n]: COMMON_CLK [=y] && COMMON_CLK_VERSATILE [=n]
> >   Selected by [y]:
> >   - ARCH_REALVIEW [=y] && (ARCH_MULTI_V5 [=n] || ARCH_MULTI_V6 [=n] || ARCH_MULTI_V7 [=y])
> >   - ARCH_VEXPRESS [=y] && ARCH_MULTI_V7 [=y]
> >   - ARCH_ZYNQ [=y] && ARCH_MULTI_V7 [=y]
> >
> > Change back the Kconfig logic to allow these to be selected
> > without the main option.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
>
> Is this similar to
> https://lore.kernel.org/r/20200527181307.2482167-1-robh@kernel.org
> ?

It's similar, but that version still breaks ZYNQ when CONFIG_COMPILE_TEST
is disabled.

      Arnd

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-05-28  9:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 13:40 [PATCH] clk: versatile: undo some dependency changes Arnd Bergmann
2020-05-28  0:34 ` Stephen Boyd
2020-05-28  9:08   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).