From patchwork Sat Jul 7 00:13:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 1168361 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id EEB653FC33 for ; Sat, 7 Jul 2012 00:17:22 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SnIeX-0001N5-0O; Sat, 07 Jul 2012 00:13:37 +0000 Received: from na3sys009aog137.obsmtp.com ([74.125.149.18]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1SnIeM-0001Mr-HU for linux-arm-kernel@lists.infradead.org; Sat, 07 Jul 2012 00:13:28 +0000 Received: from mail-pb0-f46.google.com ([209.85.160.46]) (using TLSv1) by na3sys009aob137.postini.com ([74.125.148.12]) with SMTP ID DSNKT/d/ImceighCCioS7L+5RVP345xwDjg8@postini.com; Fri, 06 Jul 2012 17:13:26 PDT Received: by pbbrp8 with SMTP id rp8so15623849pbb.5 for ; Fri, 06 Jul 2012 17:13:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=Sfs6c8Nzy+Et4FtHFbT9w6UYA+QIDhmGY9U10w5ZtWo=; b=jrM6cL4niHd24SknVSIDbyGZspCg3GPg3WrxC3eImnVAsYXvRE2hab0eZHLbatDN7T eVT4k6G2W5kBByGVCUmzZIx6vEl72ed1PybE3fZ5QHLqM6CKxoiPckJGEzDHqvi7fv0c u3QbddThj3mOdStRpOt49+al85BPY35PRXodjI3kgPEr08qCckBARkcIoL2nsUeK4vAI 3dIq3Irp3UXND0CptppaHXinBAmQd6xNhDxlXMMJitv9PH8MU93OX3fZhS7kQyDYpnov duycu3weAyIfrdXOm2TUAM+EYZsVALmhtDFEDjCzNAnWAEp4XjdO+/RrZQww5995TKbk Oakg== Received: by 10.66.73.72 with SMTP id j8mr23674265pav.20.1341620001859; Fri, 06 Jul 2012 17:13:21 -0700 (PDT) Received: from gmail.com (nsc-e-gw.nsc.com. [12.238.8.30]) by mx.google.com with ESMTPS id nj4sm8851849pbc.5.2012.07.06.17.13.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Jul 2012 17:13:20 -0700 (PDT) Date: Fri, 6 Jul 2012 17:13:10 -0700 From: Mike Turquette To: Linus Walleij Subject: Re: [GIT PULL] Integrator common clock Message-ID: <20120707001310.GA1230@gmail.com> References: <20120620212046.GI4402@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnyyPwPSotOzThBXeHyRsTDDMD3tEuCQkKiX8QXzhcq7rq2HGTRczeuNe0hawkVkl/n/HJI X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.18 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On 20120705-00:52, Linus Walleij wrote: > Versatile is two things (just to add to the confusion): > > 1) A machine named arch/arm/mach-versatile > 2) A platform named arch/arm/plat-versatile encompassing > the mach-integrator, mach-versatile, mach-realview and mach-vexpress > > This new folder is for the latter, but the only *machine* using it in the > versatile family is the Integrator. > > So far. I will likely convert mach-realview next, since I can test it. Thanks for clearing that up. I'm still curious to know whether the Kconfig file is even necessary for your case. In the interest of delaying this conversation for even longer, can you look at the below patch and let me know if it is OK for you? If you do not like it then I will take your patches as-is, though I do hope to get rid of the ugly Kconfig if possible. Thanks, Mike From: Mike Turquette Date: Fri, 6 Jul 2012 16:41:40 -0700 Subject: [PATCH] remove versatile common clk kconfig Acked-by: Linus Walleij --- arch/arm/Kconfig | 1 - drivers/clk/Kconfig | 2 -- drivers/clk/Makefile | 2 +- drivers/clk/versatile/Kconfig | 8 -------- drivers/clk/versatile/Makefile | 2 +- 5 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 drivers/clk/versatile/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1c0d6b3..6f8cf40 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -258,7 +258,6 @@ config ARCH_INTEGRATOR select CLK_VERSATILE select HAVE_TCM select ICST - select CLK_ICST select GENERIC_CLOCKEVENTS select PLAT_VERSATILE select PLAT_VERSATILE_FPGA_IRQ diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 85bffd2..3f99b90 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -41,6 +41,4 @@ config COMMON_CLK_WM831X Supports the clocking subsystem of the WM831x/2x series of PMICs from Wolfson Microlectronics. -source "drivers/clk/versatile/Kconfig" - endmenu diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 90ea91d..a4d67d7 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \ obj-$(CONFIG_ARCH_MXS) += mxs/ obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-$(CONFIG_ARCH_U300) += clk-u300.o -obj-$(CONFIG_CLK_VERSATILE) += versatile/ +obj-$(CONFIG_ARCH_INTEGRATOR) += versatile/ # Chip specific obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig deleted file mode 100644 index 169b1bc..0000000 --- a/drivers/clk/versatile/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -config CLK_VERSATILE - bool "Clocks for the ARM Versatile family" - depends on COMMON_CLK - -config CLK_ICST - bool "ICST307 VCO clock driver" - depends on COMMON_CLK - depends on ICST diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile index ac47173..50cf6a2 100644 --- a/drivers/clk/versatile/Makefile +++ b/drivers/clk/versatile/Makefile @@ -1,3 +1,3 @@ # Makefile for Versatile-specific clocks -obj-$(CONFIG_CLK_ICST) += clk-icst.o +obj-$(CONFIG_ICST) += clk-icst.o obj-$(CONFIG_ARCH_INTEGRATOR) += clk-integrator.o