From patchwork Wed May 27 18:13:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11573749 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9563913 for ; Wed, 27 May 2020 18:13:10 +0000 (UTC) Received: by mail.kernel.org (Postfix) id A406E2084C; Wed, 27 May 2020 18:13:10 +0000 (UTC) Delivered-To: soc@kernel.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E3852075A; Wed, 27 May 2020 18:13:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E3852075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=robherring2@gmail.com Received: by mail-io1-f67.google.com with SMTP id r2so16799673ioo.4; Wed, 27 May 2020 11:13:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/EruCW5OyzYkTpIMEcZw9VvP4rIyANLSRqMpkEmMESc=; b=N2WydxSMsaEfdk8NnrerusXPhRptX+wilL1EB/5OCdSekN8TlEVuhkSEPsurCdzVsJ XO5kWhIORumvLne0qcJ5hCaUBe6YzkikRpg8rKdSv9lIENd0OeKzuuggCV+hjbBQh+b4 V7yi90rAZCFRJukZkR5u5UCjTYyYLq5Kc9ilW6XFlcu4PDPhrQezXsRzk+SpelPodPvx PSeIx4ZlJLVWI+HC2aJTaEFzwLhBHevudpJeXRz5ez8YBSEzayqfn0/mLFZqCy469eY5 LTdJY7UVPW8walQcq5goqV058hlBfaRGIvheF27NVTA93GElBXTT4TgzgPFqYZfqCj6y +Bow== X-Gm-Message-State: AOAM530nBH9Rk0Feoot2P9afAAi0/ZDWS+FGhh6FkeskHCqr2hvkfyo2 Y5oTUxJVobqS6dd1jpIhshhW/ws= X-Google-Smtp-Source: ABdhPJxUSllQ00lt5W6Ku5+TyPaZgvzDvlMqASKxBalVSX3oZwrMtPe4WkxLJ5GjLAWgGk9w552hsQ== X-Received: by 2002:a6b:ee15:: with SMTP id i21mr22853775ioh.179.1590603189487; Wed, 27 May 2020 11:13:09 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.252]) by smtp.googlemail.com with ESMTPSA id e12sm1562445ioc.37.2020.05.27.11.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 11:13:08 -0700 (PDT) From: Rob Herring List-Id: To: soc@kernel.org Cc: anders.roxell@linaro.org, Linus Walleij , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH] clk: versatile: Fix kconfig dependency on COMMON_CLK_VERSATILE Date: Wed, 27 May 2020 12:13:07 -0600 Message-Id: <20200527181307.2482167-1-robh@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 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 --- 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(-) 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