From patchwork Tue May 22 20:45:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 10419611 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 0823E6032A for ; Tue, 22 May 2018 20:45:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9EB82022C for ; Tue, 22 May 2018 20:45:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE37C290C1; Tue, 22 May 2018 20:45:42 +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 556C02022C for ; Tue, 22 May 2018 20:45:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752991AbeEVUpl (ORCPT ); Tue, 22 May 2018 16:45:41 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:44263 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbeEVUpl (ORCPT ); Tue, 22 May 2018 16:45:41 -0400 Received: by mail-wr0-f194.google.com with SMTP id y15-v6so22518938wrg.11 for ; Tue, 22 May 2018 13:45:40 -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:in-reply-to:references; bh=MgFE4dfKnRxdlTsLx4o5m0qeruo1TFFX+FIUzhTIIdQ=; b=U3M+Fbhj3gOzqQiZsXnbGROf0uSdRQKSR8Y2qZhjiZ6kXtRkwIvfD+GToYTPFMT7vA sXeuuQ41KAzlUG3jE/folngGbZNz0A/DmhiTzK+RqnHh70S3nhOTA8PshWqrEaSTBgAp XTOQT0YNTtjAFC2cic91pIXfuElEJroJOYML8= 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:in-reply-to :references; bh=MgFE4dfKnRxdlTsLx4o5m0qeruo1TFFX+FIUzhTIIdQ=; b=bVq3XlSUqzSEHCzKJI6dCgxxmTRPJqQdJvNoXjnSXHSWfnVAvkMuoQY5jXJl+RUD58 vj/77WfffFcrfyHddC+20Bz6UQdZ8OY0HE2LufWgoieBaLXcw53u+ZaRNGpX9Xo1baA4 3Hd4y73wAM25jGGLk0BSJf3Lyn/Ky2r+VcwZSwcredaOxEx9aUqf/DjBIlF5VLCol8R0 /QOg3m7ZB/EGQn+bd6qN/NtOe6DSVh/G6Hsu0lPurNbH5Xh57CPwy3s1RK/0kst3P90u KHoXN5r2IDgkS+NkwJKGCcsx+2N33zpID7cX5B35qYxm5JhTQwqNJBjFHEWv84XKsQyy 1Shw== X-Gm-Message-State: ALKqPwf56KAhLNt2xozjFaq2ELaNNAqmStVCaGdoF/zncrOFs7PjD2CM sayofEfcDXqFtiNKh+98XB12cg== X-Google-Smtp-Source: AB8JxZoAPmg3Z9CI/Vqhj1xvmYOx8KteEIjvjosGkS2ovKI8zekCYv1EnNmMmLkGuvNV0r7tSZnyDA== X-Received: by 2002:adf:b0c1:: with SMTP id j1-v6mr15987wra.3.1527021939837; Tue, 22 May 2018 13:45:39 -0700 (PDT) Received: from mai.localdomain ([37.171.223.204]) by smtp.gmail.com with ESMTPSA id q2-v6sm18260199wrm.26.2018.05.22.13.45.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 13:45:39 -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 V2] clk/driver/hisi: Consolidate the Kconfig for the CLOCK_STUB Date: Tue, 22 May 2018 22:45:28 +0200 Message-Id: <1527021928-1243-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527021018-31698-1-git-send-email-daniel.lezcano@linaro.org> References: <1527021018-31698-1-git-send-email-daniel.lezcano@linaro.org> 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. --- drivers/clk/hisilicon/Kconfig | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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.