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: 136603 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp58274lji; Tue, 22 May 2018 13:45:45 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoTihEN4KvIHU+wAPZqr2pfUp4jB5FGq4Pw2XIjX0BYI3/pFxLDVU86wKyX68V7y1TUcsdf X-Received: by 2002:a17:902:8a91:: with SMTP id p17-v6mr48202plo.18.1527021945501; Tue, 22 May 2018 13:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527021945; cv=none; d=google.com; s=arc-20160816; b=B9vDRatdJaukReU/62EtadRQAdlZNnlFgUcqiilSucCBG534pMuvA2ogyPXPJxnNMk B4ltN5RETNy2bxO9wK+4zTrwAkScLAbw0zx+3EtNWCortBKJz1qhGSfshHdtFxRQfn52 XRKd+yTg69IZCDwlr9gOTmQK9SW5lOSVMjnkuRzOuBzpMVYGWpngAapFPXR0GzlmVH/l lY1vgZUBle0iAsqAdtThN7K7+iKHj4FKvQtEIBtN2zobPsfiUbTq0TSwKmkfW/N4J08K 9X0HZ/esNfFyNFGeSz5da8vSYWboiWEsziMq7kUldpBEMqQEIemsMchsjdrCEZSe0HOG Kjwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=MgFE4dfKnRxdlTsLx4o5m0qeruo1TFFX+FIUzhTIIdQ=; b=Xc4HpMIlNTxt+zhqqI8uRM3VTUldUhBc0f+nKP5QJp23lNgNLt0R5WPVw4JX0uY9cQ LhW/T4070XhlMCdmbfSAtR1PXlhZJO/51zxAjexf7gqQ6+Ps9dgGz10HTeyd7+Wp95ub 7JZBuRs1Z0DtdyM9N9qIqyP9N5rMq/zs4NCFuxdJ9Nd5L39B8nX2+DdowYofT5uHEgXz w9BkzH4Rq8B0J4thtA/q5D6RCcC08lMsnZTTDfwzxUJtp4xWgc2pP5JwU7xQsjuIfjmb buXb7yIcfGNid9CWqy2NQxBRBFcmhdXYP8AG9S8efSfLl6gZkD7kDUdRRSJTW2oUctr1 Iz8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U3M+Fbhj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6-v6si13439660pgq.85.2018.05.22.13.45.45; Tue, 22 May 2018 13:45:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U3M+Fbhj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753054AbeEVUpm (ORCPT + 30 others); Tue, 22 May 2018 16:45:42 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:37290 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752831AbeEVUpl (ORCPT ); Tue, 22 May 2018 16:45:41 -0400 Received: by mail-wr0-f195.google.com with SMTP id i12-v6so9367604wrc.4 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=AOsAo0NAJh+wSwf0vnhgHc1os4tyu+svlbNpfoW7MogGdf2N50NNrJwWcEyUuCi/wD CRAiD+hMWzwrHagV/7lRG9/VNJIHqKLycfMoxHGXOcjWl50EPhhNG2981wSTMccLT8rs uonHydGWIcTT+DJ4Jsie5/xqcmZzrZxYUHsmXIyRkJNPj2G3xI2HXTK1d0T1rAQwuTDz E/tDWD5KOkrGhGNOxF2/mYE9Vw4MWDPtKT3OxHT6+j9+kogpvq9M3gKgkcP5RBtwQMCr kC3jAqEtFSaDTwWXGQpljZvfADP0F6LMAJSka/bePFMdy3Ln0poTknDG8iHsqJGjJub4 xRqw== X-Gm-Message-State: ALKqPwcICNnJUsJIU+tdYUqQsIgP66jEAaFblziidoMf+YVQXRXDPlBB +jzCh6TK05DVtJHCHzpxjumR8w== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.7.4 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.