clk: versatile: Fix kconfig dependency on COMMON_CLK_VERSATILE
Subsystems (2)
PATCH 1/1 clk: versatile: Fix kconfig dependency on COMMON_CLK_VERSATILE
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'.
---
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/[email protected]/
drivers/clk/versatile/Kconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/clk/versatile/Kconfig +4 -7
@@ -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
Signature · 1 line
2.25.1
Quoting Rob Herring (2020-05-27 11:13:07)
Quoted 19 lines
If
COMPILE_TESTis enabled, thenCOMMON_CLK_VERSATILEcan 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_VERSATILEand just using 'menu' instead of 'menuconfig'.
Quoted 8 lines
Fixes 81134fb541d4 ("clk: versatile: Rework kconfig structure")Cc Linus Walleij <[email protected]>Cc Michael Turquette <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Rob Herring <[email protected]>---
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 7 lines · Rob Herring
drivers/clk/versatile/Kconfig +0
-0@@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only
drivers/clk/versatile/Kconfig line 6
Quoted 10 lines
drivers/clk/versatile/Kconfig +3
-6-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
Quoted 9 lines · Arnd Bergmann
Quoted 7 lines · Rob Herring
drivers/clk/versatile/Kconfig +0
-0@@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only
Quoted 13 lines
drivers/clk/versatile/Kconfig line 6
Quoted 10 lines
drivers/clk/versatile/Kconfig +3
-6-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_TESTI've applied this version now but added
ARCH_ZYNQas 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
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 24 lines · Rob Herring
Quoted 9 lines · Arnd Bergmann
Quoted 7 lines · Rob Herring
drivers/clk/versatile/Kconfig +0
-0@@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-onlyQuoted 13 lines
drivers/clk/versatile/Kconfig line 6
Quoted 10 lines
drivers/clk/versatile/Kconfig +3
-6-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_TESTI've applied this version now but added
ARCH_ZYNQas an additional dependency to work around one of the warnings we got earlier.
Quoted 2 lines
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
Quoted 32 lines · Arnd Bergmann
Quoted 24 lines · Rob Herring
Quoted 9 lines · Arnd Bergmann
Quoted 7 lines · Rob Herring
drivers/clk/versatile/Kconfig +0
-0@@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-onlyQuoted 13 lines
drivers/clk/versatile/Kconfig line 6
Quoted 10 lines
drivers/clk/versatile/Kconfig +3
-6-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_TESTI've applied this version now but added
ARCH_ZYNQas an additional dependency to work around one of the warnings we got earlier.Quoted 2 lines
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.
Quoted 5 lines
I had noticed that the Zynq
Kconfigseemed 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