From patchwork Tue Feb 11 17:10:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 24487 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6233F203F3 for ; Tue, 11 Feb 2014 17:16:20 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id h16sf34751012oag.4 for ; Tue, 11 Feb 2014 09:16:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=WOJdayV2KVqnzNxWOt/rK5JXMBxMPlbcQ8Z9jZp4mo4=; b=RBabYqVm0HI/+Eoa+qIMIHQf8pIV/QLv5a5eStD0URnCBw3SqhFJHjedvkikBONHdC W8Y+wznXkJsBPkN/aA14jXqaQ0hyUAGP+hmS4n8n3Ej/onEOWSP2hPtn92hT/iSZs7Nv +9ERY6c4QFmeOcyaJLceDSf3veEsMJgaZqle3zHklrKbf7ydsakdsiUSkKW5tSxpPXEf QSXG404wR6RnSRwDXrSVxc4ki8oa36xTQFNmlq/sMckTZH7rrk+TnIzUUchr5sWWA9nb joH6UBs/zSlAKvs8D9N++w+IDD9LccDQ+2EZuLDG7pKOSoFW3fBNzNUp4klN21GVIUFa 3SHw== X-Gm-Message-State: ALoCoQnedT4CVe7+1DpGbsvRqUrhdGNZ7H7x/hTGVFgv/Az0X1oFYA/+QkR26C+oMRUKdmMfmFpa X-Received: by 10.43.92.73 with SMTP id bp9mr187109icc.26.1392138979386; Tue, 11 Feb 2014 09:16:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.47 with SMTP id s44ls2521413qgs.70.gmail; Tue, 11 Feb 2014 09:16:19 -0800 (PST) X-Received: by 10.53.0.230 with SMTP id bb6mr836621vdd.39.1392138979241; Tue, 11 Feb 2014 09:16:19 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id wt4si6141012vcb.115.2014.02.11.09.16.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 09:16:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id jx11so6464064veb.10 for ; Tue, 11 Feb 2014 09:16:19 -0800 (PST) X-Received: by 10.58.219.1 with SMTP id pk1mr205756vec.49.1392138979130; Tue, 11 Feb 2014 09:16:19 -0800 (PST) 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.220.174.196 with SMTP id u4csp262588vcz; Tue, 11 Feb 2014 09:16:18 -0800 (PST) X-Received: by 10.68.190.169 with SMTP id gr9mr45713439pbc.30.1392138977812; Tue, 11 Feb 2014 09:16:17 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fu1si19604730pbc.314.2014.02.11.09.16.17; Tue, 11 Feb 2014 09:16:17 -0800 (PST) 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 S1753063AbaBKRPw (ORCPT + 27 others); Tue, 11 Feb 2014 12:15:52 -0500 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:25197 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752044AbaBKRKr (ORCPT ); Tue, 11 Feb 2014 12:10:47 -0500 Received: from hornet.Cambridge.Arm.com (hornet.cambridge.arm.com [10.2.201.45]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 200471401A8; Tue, 11 Feb 2014 11:10:45 -0600 (CST) From: Pawel Moll To: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Pawel Moll , Mike Turquette Subject: [PATCH 03/12] clk: versatile: Split config options for sp810 and vexpress_osc Date: Tue, 11 Feb 2014 17:10:27 +0000 Message-Id: <1392138636-29240-4-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1392138636-29240-1-git-send-email-pawel.moll@arm.com> References: <1392138636-29240-1-git-send-email-pawel.moll@arm.com> 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: pawel.moll@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=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: , Move the Kconfig entry for Versatile (& Express) clock drivers into a separate file and add individual options for sp810 and vexpress_osc drivers, as they are optional in some configurations and may have separate dependencies. Cc: Mike Turquette Signed-off-by: Pawel Moll --- drivers/clk/Kconfig | 9 +-------- drivers/clk/versatile/Kconfig | 26 ++++++++++++++++++++++++++ drivers/clk/versatile/Makefile | 5 +++-- 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 drivers/clk/versatile/Kconfig diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 7641965..11e7058 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -30,14 +30,7 @@ config COMMON_CLK_WM831X Supports the clocking subsystem of the WM831x/2x series of PMICs from Wolfson Microlectronics. -config COMMON_CLK_VERSATILE - bool "Clock driver for ARM Reference designs" - depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS || ARM64 - ---help--- - Supports clocking on ARM Reference designs: - - Integrator/AP and Integrator/CP - - RealView PB1176, EB, PB11MP and PBX - - Versatile Express +source "drivers/clk/versatile/Kconfig" config COMMON_CLK_MAX77686 tristate "Clock driver for Maxim 77686 MFD" diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig new file mode 100644 index 0000000..1530c93 --- /dev/null +++ b/drivers/clk/versatile/Kconfig @@ -0,0 +1,26 @@ +config COMMON_CLK_VERSATILE + bool "Clock driver for ARM Reference designs" + depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS || ARM64 + ---help--- + Supports clocking on ARM Reference designs: + - Integrator/AP and Integrator/CP + - RealView PB1176, EB, PB11MP and PBX + - Versatile Express + +config CLK_SP810 + bool "Clock driver for ARM SP810 System Controller" + depends on COMMON_CLK_VERSATILE + default y if ARCH_VEXPRESS + ---help--- + Supports clock muxing (REFCLK/TIMCLK to TIMERCLKEN0-3) capabilities + of the ARM SP810 System Controller cell. + +config CLK_VEXPRESS_OSC + bool "Clock driver for Versatile Express OSC clock generators" + depends on COMMON_CLK_VERSATILE + depends on VEXPRESS_CONFIG + default y if ARCH_VEXPRESS + ---help--- + Simple regmap-based driver driving clock generators on Versatile + Express platforms hidden behind its configuration infrastructure, + commonly known as OSCs. diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile index c16ca78..fd449f9 100644 --- a/drivers/clk/versatile/Makefile +++ b/drivers/clk/versatile/Makefile @@ -3,5 +3,6 @@ obj-$(CONFIG_ICST) += clk-icst.o obj-$(CONFIG_ARCH_INTEGRATOR) += clk-integrator.o obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o -obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o clk-sp810.o -obj-$(CONFIG_VEXPRESS_CONFIG) += clk-vexpress-osc.o +obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o +obj-$(CONFIG_CLK_SP810) += clk-sp810.o +obj-$(CONFIG_CLK_VEXPRESS_OSC) += clk-vexpress-osc.o