From patchwork Thu Oct 22 19:25:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 55449 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 75E3020581 for ; Thu, 22 Oct 2015 19:25:23 +0000 (UTC) Received: by wiclg3 with SMTP id lg3sf913517wic.3 for ; Thu, 22 Oct 2015 12:25:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:content-type:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=UcqZKDPvrD59YeNL5zxP0+hcsWtZDQrbp/kfgmcKCFc=; b=T2ksvUJbi/xOVNQsi9Yhf1ZRdSPKFwlY7e5JEvvq6p7F58Se4aRdsCe2Pd/f12N8cO lQOS2uAI/dAKPjVF62N525b5LIX8gOzKn5G7KY7jkcFq6hH3Xd9S0ZitqL4rVSJaVrwf ftApZXDoVIYgyh3KEJj2pT5HqxbaQsqzABoFjG2bf9KVySNp+2gEIpKwDs47JsCGV8pI SmiafbVPEO2ehqkmZBirPZgz7h0Gq2TDfeXkGOadhTa0tkXOqEfWjWEmAuj3RlSVODo6 us8gK80s2DPuI01eF8liISkisPLPKDlYVoNLehVXojpW+6maMuuNhksoMVnXjI+oDCK4 pbHg== X-Gm-Message-State: ALoCoQl5OMHv5dVww0+6kWiJPNydnoZ5NZydZPR0OgIweND0eRHBaqpEkKn19es7Dryf1V7w6RBG X-Received: by 10.194.248.131 with SMTP id ym3mr4082372wjc.7.1445541922801; Thu, 22 Oct 2015 12:25:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.212.14 with SMTP id l14ls364401lfg.44.gmail; Thu, 22 Oct 2015 12:25:22 -0700 (PDT) X-Received: by 10.25.22.149 with SMTP id 21mr6075818lfw.8.1445541922618; Thu, 22 Oct 2015 12:25:22 -0700 (PDT) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id g68si10540171lfg.68.2015.10.22.12.25.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Oct 2015 12:25:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lfbn126 with SMTP id n126so25620149lfb.2 for ; Thu, 22 Oct 2015 12:25:22 -0700 (PDT) X-Received: by 10.112.199.137 with SMTP id jk9mr9366545lbc.86.1445541922498; Thu, 22 Oct 2015 12:25:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp784700lbq; Thu, 22 Oct 2015 12:25:21 -0700 (PDT) X-Received: by 10.50.49.80 with SMTP id s16mr57933ign.49.1445541921561; Thu, 22 Oct 2015 12:25:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v66si12634008iov.186.2015.10.22.12.25.21; Thu, 22 Oct 2015 12:25:21 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757736AbbJVTZS (ORCPT + 28 others); Thu, 22 Oct 2015 15:25:18 -0400 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:27109 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753351AbbJVTZQ (ORCPT ); Thu, 22 Oct 2015 15:25:16 -0400 X-IronPort-AV: E=Sophos;i="5.20,184,1444719600"; d="scan'208";a="78530541" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw1-out.broadcom.com with ESMTP; 22 Oct 2015 14:22:10 -0700 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.235.1; Thu, 22 Oct 2015 12:25:15 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) with Microsoft SMTP Server id 14.3.235.1; Thu, 22 Oct 2015 12:25:14 -0700 Received: from venom.rtp.broadcom.com (unknown [10.27.64.103]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id D118C40FE6; Thu, 22 Oct 2015 12:22:15 -0700 (PDT) From: Jon Mason To: Michael Turquette , Stephen Boyd CC: Florian Fainelli , Hauke Mehrtens , Ray Jui , Scott Branden , , , , Subject: [PATCH] clk: iproc: Make clocks visible options Date: Thu, 22 Oct 2015 15:25:13 -0400 Message-ID: <1445541913-25066-1-git-send-email-jonmason@broadcom.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: jonmason@broadcom.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Make the clocks visible options that can be selected by anyone. This avoids the problems of: 1) Select is a reverse dependency and is hard for people to understand and can sometimes be a pain to track down 2) Build coverage goes down because configs are hidden 3) Code bloat Patch suggested by Stephen Boyd Signed-off-by: Jon Mason --- arch/arm/mach-bcm/Kconfig | 1 - drivers/clk/bcm/Kconfig | 35 ++++++++++++++++++++++++++++++++++- drivers/clk/bcm/Makefile | 7 +++---- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 679798b..cacaaec 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -14,7 +14,6 @@ config ARCH_BCM_IPROC select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ARM_GLOBAL_TIMER - select COMMON_CLK_IPROC select CLKSRC_MMIO select ARCH_REQUIRE_GPIOLIB select ARM_AMBA diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig index 46ee475..0352ccf 100644 --- a/drivers/clk/bcm/Kconfig +++ b/drivers/clk/bcm/Kconfig @@ -9,8 +9,41 @@ config CLK_BCM_KONA in the BCM281xx and BCM21664 families. config COMMON_CLK_IPROC - bool + bool "Broadcom iProc clock support" + depends on ARCH_BCM_IPROC depends on COMMON_CLK + default ARCH_BCM_IPROC help Enable common clock framework support for Broadcom SoCs based on the iProc architecture + +if COMMON_CLK_IPROC + +comment "Broadcom iProc clocks" + +config CLK_BCM_CYGNUS + bool "Broadcom Cygnus clock support" + depends on COMMON_CLK_IPROC + depends on ARCH_BCM_CYGNUS + default ARCH_BCM_CYGNUS + help + Enable common clock framework support for the Broadcom Cygnus SoC + +config CLK_BCM_NSP + bool "Broadcom Northstar/Northstar Plus clock support" + depends on COMMON_CLK_IPROC + depends on ARCH_BCM_5301X || ARCH_BCM_NSP + default ARCH_BCM_5301X || ARCH_BCM_NSP + help + Enable common clock framework support for the Broadcom Northstar and + Northstar Plus SoCs + +config CLK_BCM_NS2 + bool "Broadcom Northstar 2 clock support" + depends on ARM64 + depends on COMMON_CLK_IPROC + default ARCH_BCM_IPROC + help + Enable common clock framework support for the Broadcom Northstar 2 SoC + +endif diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile index 2d1cbc5..05d5830 100644 --- a/drivers/clk/bcm/Makefile +++ b/drivers/clk/bcm/Makefile @@ -3,7 +3,6 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm281xx.o obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm21664.o obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o -obj-$(CONFIG_COMMON_CLK_IPROC) += clk-ns2.o -obj-$(CONFIG_ARCH_BCM_CYGNUS) += clk-cygnus.o -obj-$(CONFIG_ARCH_BCM_NSP) += clk-nsp.o -obj-$(CONFIG_ARCH_BCM_5301X) += clk-nsp.o +obj-$(CONFIG_CLK_BCM_CYGNUS) += clk-cygnus.o +obj-$(CONFIG_CLK_BCM_NSP) += clk-nsp.o +obj-$(CONFIG_CLK_BCM_NS2) += clk-ns2.o