| Message ID | 20200527181307.2482167-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | clk: versatile: Fix kconfig dependency on COMMON_CLK_VERSATILE | expand |
Quoting Rob Herring (2020-05-27 11:13:07) > If COMPILE_TEST is enabled, then COMMON_CLK_VERSATILE can be disabled > when dependent options like ICST are selected resulting in kconfig > warnings: > > 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] > > 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]) > > Fix this by dropping COMMON_CLK_VERSATILE and just using 'menu' instead > of 'menuconfig'. > > Fixes: 81134fb541d4 ("clk: versatile: Rework kconfig structure") > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Michael Turquette <mturquette@baylibre.com> > Cc: Stephen Boyd <sboyd@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-clk@vger.kernel.org > Signed-off-by: Rob Herring <robh@kernel.org> > --- Acked-by: Stephen Boyd <sboyd@kernel.org>
On Wed, May 27, 2020 at 8:13 PM Rob Herring <robh@kernel.org> wrote: > diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig > index a0ed412e8396..8c1b0e8e8d32 100644 > --- a/drivers/clk/versatile/Kconfig > +++ b/drivers/clk/versatile/Kconfig > @@ -1,11 +1,8 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -menuconfig COMMON_CLK_VERSATILE > - bool "Clock driver for ARM Reference designs" if COMPILE_TEST > - default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \ > - ARCH_VERSATILE || ARCH_VEXPRESS > - > -if COMMON_CLK_VERSATILE > +menu "Clock driver for ARM Reference designs" > + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \ > + ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST > I've applied this version now but added ARCH_ZYNQ as an additional dependency to work around one of the warnings we got earlier. Arnd
On Thu, May 28, 2020 at 5:57 AM Arnd Bergmann <arnd@arndb.de> wrote: > > On Wed, May 27, 2020 at 8:13 PM Rob Herring <robh@kernel.org> wrote: > > diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig > > index a0ed412e8396..8c1b0e8e8d32 100644 > > --- a/drivers/clk/versatile/Kconfig > > +++ b/drivers/clk/versatile/Kconfig > > @@ -1,11 +1,8 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > > > -menuconfig COMMON_CLK_VERSATILE > > - bool "Clock driver for ARM Reference designs" if COMPILE_TEST > > - default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \ > > - ARCH_VERSATILE || ARCH_VEXPRESS > > - > > -if COMMON_CLK_VERSATILE > > +menu "Clock driver for ARM Reference designs" > > + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \ > > + ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST > > > > I've applied this version now but added ARCH_ZYNQ as an additional > dependency to work around one of the warnings we got earlier. That's just spreading a copy-n-paste error. Why don't you apply the Zynq patch I referenced if Michal never did? Rob
On Thu, May 28, 2020 at 11:29 PM Rob Herring <robh@kernel.org> wrote: > On Thu, May 28, 2020 at 5:57 AM Arnd Bergmann <arnd@arndb.de> wrote: > > > > On Wed, May 27, 2020 at 8:13 PM Rob Herring <robh@kernel.org> wrote: > > > diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig > > > index a0ed412e8396..8c1b0e8e8d32 100644 > > > --- a/drivers/clk/versatile/Kconfig > > > +++ b/drivers/clk/versatile/Kconfig > > > @@ -1,11 +1,8 @@ > > > # SPDX-License-Identifier: GPL-2.0-only > > > > > > -menuconfig COMMON_CLK_VERSATILE > > > - bool "Clock driver for ARM Reference designs" if COMPILE_TEST > > > - default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \ > > > - ARCH_VERSATILE || ARCH_VEXPRESS > > > - > > > -if COMMON_CLK_VERSATILE > > > +menu "Clock driver for ARM Reference designs" > > > + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \ > > > + ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST > > > > > > > I've applied this version now but added ARCH_ZYNQ as an additional > > dependency to work around one of the warnings we got earlier. > > That's just spreading a copy-n-paste error. Why don't you apply the > Zynq patch I referenced if Michal never did? Sorry I completely missed the reference from your previous email. I've applied that patch on top now, reverting the change I did in the process. I had noticed that the Zynq Kconfig seemed rather odd, by my interpretation was that it had been added intentionally in order to use an existing clk controller driver for configurable logic on Zynq that was not part of the main DT file. As Michal already confirmed that it was just a mistake, I agree it should be removed. Arnd
On 29. 05. 20 9:38, Arnd Bergmann wrote: > On Thu, May 28, 2020 at 11:29 PM Rob Herring <robh@kernel.org> wrote: >> On Thu, May 28, 2020 at 5:57 AM Arnd Bergmann <arnd@arndb.de> wrote: >>> >>> On Wed, May 27, 2020 at 8:13 PM Rob Herring <robh@kernel.org> wrote: >>>> diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig >>>> index a0ed412e8396..8c1b0e8e8d32 100644 >>>> --- a/drivers/clk/versatile/Kconfig >>>> +++ b/drivers/clk/versatile/Kconfig >>>> @@ -1,11 +1,8 @@ >>>> # SPDX-License-Identifier: GPL-2.0-only >>>> >>>> -menuconfig COMMON_CLK_VERSATILE >>>> - bool "Clock driver for ARM Reference designs" if COMPILE_TEST >>>> - default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \ >>>> - ARCH_VERSATILE || ARCH_VEXPRESS >>>> - >>>> -if COMMON_CLK_VERSATILE >>>> +menu "Clock driver for ARM Reference designs" >>>> + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \ >>>> + ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST >>>> >>> >>> I've applied this version now but added ARCH_ZYNQ as an additional >>> dependency to work around one of the warnings we got earlier. >> >> That's just spreading a copy-n-paste error. Why don't you apply the >> Zynq patch I referenced if Michal never did? > > Sorry I completely missed the reference from your previous email. > I've applied that patch on top now, reverting the change I did in the > process. > > I had noticed that the Zynq Kconfig seemed rather odd, by my interpretation > was that it had been added intentionally in order to use an existing clk > controller driver for configurable logic on Zynq that was not part of the > main DT file. As Michal already confirmed that it was just a mistake, I > agree it should be removed. Sorry I didn't sent PR yet but I have your ICST patch in next branch. Arnd has applied it already that's why won't be sending PR just for this. Thanks, Michal
diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig index a0ed412e8396..8c1b0e8e8d32 100644 --- a/drivers/clk/versatile/Kconfig +++ b/drivers/clk/versatile/Kconfig @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only -menuconfig COMMON_CLK_VERSATILE - bool "Clock driver for ARM Reference designs" if COMPILE_TEST - default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \ - ARCH_VERSATILE || ARCH_VEXPRESS - -if COMMON_CLK_VERSATILE +menu "Clock driver for ARM Reference designs" + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \ + ARCH_VERSATILE || ARCH_VEXPRESS || COMPILE_TEST config ICST bool "Clock driver for ARM Reference designs ICST" @@ -32,4 +29,4 @@ config CLK_VEXPRESS_OSC Express platforms hidden behind its configuration infrastructure, commonly known as OSCs. -endif +endmenu
If COMPILE_TEST is enabled, then COMMON_CLK_VERSATILE can be disabled when dependent options like ICST are selected resulting in kconfig warnings: 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] 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]) Fix this by dropping COMMON_CLK_VERSATILE and just using 'menu' instead of 'menuconfig'. Fixes: 81134fb541d4 ("clk: versatile: Rework kconfig structure") Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> --- Please apply this along with Ander's fixes to the SoC tree. Note that this patch[1] is also need to resolve the kconfig issues. Michal said he would apply it. Rob [1] https://lore.kernel.org/linux-arm-kernel/20200409221829.29421-1-robh@kernel.org/ drivers/clk/versatile/Kconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)