From patchwork Tue May 22 20:30:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 10419573 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2A7AC6016C for ; Tue, 22 May 2018 20:30:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B2DB290B8 for ; Tue, 22 May 2018 20:30:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FFCC290AB; Tue, 22 May 2018 20:30:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CC7E290C9 for ; Tue, 22 May 2018 20:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752636AbeEVUaa (ORCPT ); Tue, 22 May 2018 16:30:30 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:44202 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751423AbeEVUa3 (ORCPT ); Tue, 22 May 2018 16:30:29 -0400 Received: by mail-wr0-f194.google.com with SMTP id y15-v6so22455543wrg.11 for ; Tue, 22 May 2018 13:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=sn9AV1j16YDY9tMFn00GtFgwjbw+IHNQxYv0U56FL5s=; b=iGjHrHEs7BHWk+N4qm6ip725B6TYc6dhJLmWdFjhjKhVrxrODj2JlUkp4CS4ZcPGbD CEBNsEMB0M9Ktbc2S4zB8vBUF2+t23GYHKVjHzVoU0h5io1VUpyHJboVZ/EGpvzJC28o MWey8dfUj3JdP0vhaB4LWCPXVu4eMnd6V4aP0= 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; bh=sn9AV1j16YDY9tMFn00GtFgwjbw+IHNQxYv0U56FL5s=; b=GXf5seQiHZFZqeIq+e/3KkyHjCjlZCK+PCXh04sg0H+6nibE2b6J4FwxDCakXY0N2J lxh390aVWkZrrvbGEIKtp50lADsb+2qzjRWNicZj36dpKupJRV3RyA78hhD6cQZ8ItVm de4B3YNETd4XjydcaX8smEIBoffThq90RpRccSu9Hu6gDYJmuJa4cRo4/mtUzL9b8YB+ 2ukWNBYhj4fRuzXaEKREfdiCpe8BJvvZGKwywYE/C2J+Akzw//41JdN7vi2uXFLrC7Zt x2Nw6FbVsRiLWaKddeCTNCczuxga9VjU+A075liwdNY97Rz3DI2ajeDuZ/wOxtRipcAP rn/Q== X-Gm-Message-State: ALKqPwcBv6l2sEvXav336KLVD9Os6ae5Jn5d6dlwWZxuALn5QySJe7uV Vc10a3ZlsOJDe2BZdGj7J3Ck89SQFXk= X-Google-Smtp-Source: AB8JxZoDuQTv8MtdhQDNpJjymw9Bi5fFNDxHMQx3mRBQHyLziG6K/eLFDnmyrUb4Gqgm4nJ34M3pjw== X-Received: by 2002:adf:b78b:: with SMTP id s11-v6mr19035161wre.247.1527021028010; Tue, 22 May 2018 13:30:28 -0700 (PDT) Received: from mai.localdomain ([37.171.223.204]) by smtp.gmail.com with ESMTPSA id h188-v6sm838608wmf.8.2018.05.22.13.30.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 13:30:27 -0700 (PDT) From: Daniel Lezcano To: sboyd@kernel.org, mturquette@baylibre.com Cc: leo.yan@linaro.org, olof@lixom.net, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH] clk/driver/hisi: Consolidate the Kconfig for the CLOCK_STUB Date: Tue, 22 May 2018 22:30:18 +0200 Message-Id: <1527021018-31698-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current defconfig is inconsistent as it selects the mailbox and the clock for the hi6220 and the hi3660 without having their Kconfigs making sure the dependencies are correct. It ends up when selecting different versions for the kernel (for example when git bisecting) those options disappear and they don't get back, leading to unexpected behaviors. In our case, the cpufreq driver does no longer work because the clock fails to initialize due to the clock stub and the mailbox missing. In order to have the dependencies correctly set when defaulting, let's do the same as commit 3a49afb84ca074e ("clk: enable hi655x common clk automatically") where we select automatically the driver when the parent driver is selected. With sensible defaults in place, we can leave other choices for EXPERT. Acked-by: Stephen Boyd Signed-off-by: Daniel Lezcano Signed-off-by: Leo Yan --- Split the patch into the clk specific and resent as requested by Olof Johansson. --- arch/arm64/configs/defconfig | 1 - drivers/clk/hisilicon/Kconfig | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ecf6137..1d9d8b9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -549,7 +549,6 @@ CONFIG_HWSPINLOCK_QCOM=y CONFIG_ARM_MHU=y CONFIG_PLATFORM_MHU=y CONFIG_BCM2835_MBOX=y -CONFIG_HI6220_MBOX=y CONFIG_QCOM_APCS_IPC=y CONFIG_ROCKCHIP_IOMMU=y CONFIG_TEGRA_IOMMU_SMMU=y diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig index 1bd4355..becdb1d 100644 --- a/drivers/clk/hisilicon/Kconfig +++ b/drivers/clk/hisilicon/Kconfig @@ -44,14 +44,17 @@ config RESET_HISI Build reset controller driver for HiSilicon device chipsets. config STUB_CLK_HI6220 - bool "Hi6220 Stub Clock Driver" - depends on COMMON_CLK_HI6220 && MAILBOX - default ARCH_HISI + bool "Hi6220 Stub Clock Driver" if EXPERT + depends on (COMMON_CLK_HI6220 || COMPILE_TEST) + depends on MAILBOX + default COMMON_CLK_HI6220 help Build the Hisilicon Hi6220 stub clock driver. config STUB_CLK_HI3660 - bool "Hi3660 Stub Clock Driver" - depends on COMMON_CLK_HI3660 && MAILBOX + bool "Hi3660 Stub Clock Driver" if EXPERT + depends on (COMMON_CLK_HI3660 || COMPILE_TEST) + depends on MAILBOX + default COMMON_CLK_HI3660 help Build the Hisilicon Hi3660 stub clock driver.