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: 136602 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp44972lji; Tue, 22 May 2018 13:30:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq0otyhSD27cBpO2rJmzAZGCi5x0BHjKhDHtYbZvPURo3II/D5c/cdxYjoTvgrarqsPa+j+ X-Received: by 2002:a62:7f91:: with SMTP id a139-v6mr25537250pfd.25.1527021033432; Tue, 22 May 2018 13:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527021033; cv=none; d=google.com; s=arc-20160816; b=FbFHKjaTPmFih6CvCQe773xvtyt6xrwJpBWfD2Sgqp822jn6tQtQmxcdyj+4tvmTVH FLn665CQunSp9NSTId50zZLlR7We08MCXi5ChkzILfNMruwWQ1WGkRjhdp1EYCHyJAUl RF5Nku+jtc1KjRW9FchPcQOefsRXzdc3orYI7OL2DrkVfAgMExxlHnGTaAoa6jGn2E/4 k6bwOl5ARO3NtC+kWc27MmtC7acxyQAAPiKbjdTuerN9iU8f72aWNimhPufQO9qmUBZb /I7KZz0+2fDcJEhILPqbnPQTl23Jw3WTF24o4ywiHzWgx1D5wsXgXxnItkCfXwQFtrJz GMIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=sn9AV1j16YDY9tMFn00GtFgwjbw+IHNQxYv0U56FL5s=; b=H67Qzp7qGGxSK04StWfa5qKCbET4kxQj1RmOVaNSVQIIwgNSULBH9j9/5Vd6fOWm1u Fv/MxbRTElCdamMchQnTTWiMFwiFAihGF+lGXJt3dNoR6WDfGn3FWd449w7bTaclh5TH fyiChXQ+VgqXAwkt4LAKyOhJgKznuf/HK4fNV1ifpruqRxGv4TVKJ62OgNnI2niDMXO3 18Jauwf6qc/vSAbrxhOiqERYi9kQFHsz5x6pD2yz6FdakPa9ZC15hXLrUTfQ1lg9ScKN RPnqono7UPTrsu7pZPpAemrjMuLHfVWmaSdQUdcgXNY8SivL5w1ElQf56qvk2T1MAAKO wBYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iGjHrHEs; 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 y40-v6si17183672pla.470.2018.05.22.13.30.33; Tue, 22 May 2018 13:30:33 -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=iGjHrHEs; 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 S1752835AbeEVUaa (ORCPT + 30 others); Tue, 22 May 2018 16:30:30 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:39963 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748AbeEVUa3 (ORCPT ); Tue, 22 May 2018 16:30:29 -0400 Received: by mail-wr0-f194.google.com with SMTP id p3-v6so3664413wrn.7 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=NC6QRXAQ/Y2/tWVLR+vCuooWEt6zbn4M0Lu4JcdNZjyjjbPAOPGWRIEvVO/CUYh1UV sAiGj8APRUwUaRMt4xqbla19Ga3yk10Tfo78xSLX6OJw7aQdFmgvFHc2JE2mjfAWsYMC ibvpEkCMfVXF2ATLFlukW0NlJP+dEK2M+GqS4LXPu736pdJiMx8jcPZMcdyEKvWuINqw Ag7ml79J+9Z2+0Xjua1U18M5xp3sS4bdV8IryPyRHq0HBDRCVbGF7kn6UcoeboRBXnJ7 DSyF1wNDxXu+3vSECHQBHXQHK0y1fj644yzNSr8leivvQoTFpl+mGLZ/5ZCCnE7vzuTY J8Pg== X-Gm-Message-State: ALKqPwcKy6MmeI3fpGqOfOsK+nKQkWf47Wf5KuqjdqipyfBPUUKG3yZS xZIFhminZgNmFQ0PNqZB7K1wxg== 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-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. --- arch/arm64/configs/defconfig | 1 - drivers/clk/hisilicon/Kconfig | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) -- 2.7.4 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.