| Message ID | 20200527134043.807045-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | clk: versatile: undo some dependency changes | expand |
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 ?
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
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
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(-)