Skip to content

Commit 5f55f1f

Browse files
robherringarndb
authored andcommitted
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'. [arnd: add ZYNQ to the dependency list] Link: https://lore.kernel.org/r/[email protected] Fixes: 81134fb ("clk: versatile: Rework kconfig structure") Cc: Linus Walleij <[email protected]> Cc: Michael Turquette <[email protected]> Cc: Stephen Boyd <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Rob Herring <[email protected]> Acked-by: Stephen Boyd <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 147922f commit 5f55f1f

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

drivers/clk/versatile/Kconfig

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
menuconfig COMMON_CLK_VERSATILE
4-
bool "Clock driver for ARM Reference designs" if COMPILE_TEST
5-
default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \
6-
ARCH_VERSATILE || ARCH_VEXPRESS
7-
8-
if COMMON_CLK_VERSATILE
3+
menu "Clock driver for ARM Reference designs"
4+
depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \
5+
ARCH_VERSATILE || ARCH_VEXPRESS || ARCH_ZYNQ || COMPILE_TEST
96

107
config ICST
118
bool "Clock driver for ARM Reference designs ICST"
@@ -32,4 +29,4 @@ config CLK_VEXPRESS_OSC
3229
Express platforms hidden behind its configuration infrastructure,
3330
commonly known as OSCs.
3431

35-
endif
32+
endmenu

0 commit comments

Comments
 (0)