From 5f55f1fb187ddb7d58bc01a68b93a5e109730378 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 27 May 2020 12:13:07 -0600 Subject: 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/20200527181307.2482167-1-robh@kernel.org Fixes: 81134fb541d4 ("clk: versatile: Rework kconfig structure") Cc: Linus Walleij Cc: Michael Turquette Cc: Stephen Boyd Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org Signed-off-by: Rob Herring Acked-by: Stephen Boyd Signed-off-by: Arnd Bergmann --- drivers/clk/versatile/Kconfig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'drivers/clk/versatile') diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig index a0ed412e8396..84a2596e9721 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 || ARCH_ZYNQ || 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 -- cgit v1.2.3