From patchwork Thu May 10 11:26:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 158272 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 31379B6FB4 for ; Thu, 10 May 2012 22:52:01 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SSSmT-0008F5-P5; Thu, 10 May 2012 12:47:42 +0000 Received: from eu1sys200aog103.obsmtp.com ([207.126.144.115]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1SSRXB-00016J-Gs for linux-arm-kernel@lists.infradead.org; Thu, 10 May 2012 11:27:51 +0000 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob103.postini.com ([207.126.147.11]) with SMTP ID DSNKT6ul+IqgYJZncPGRhcjesuEmDMRJ4XmI@postini.com; Thu, 10 May 2012 11:27:48 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 5AD3BB0; Thu, 10 May 2012 11:18:23 +0000 (GMT) Received: from Webmail-ap.st.com (eapex1hubcas4.st.com [10.80.176.69]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 6D1B4121C; Thu, 10 May 2012 11:26:44 +0000 (GMT) Received: from [10.199.82.235] (10.199.82.235) by Webmail-ap.st.com (10.80.176.7) with Microsoft SMTP Server (TLS) id 8.3.192.1; Thu, 10 May 2012 19:26:38 +0800 Message-ID: <4FABA5EC.9050708@st.com> Date: Thu, 10 May 2012 16:56:36 +0530 From: Viresh Kumar User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: Olof Johansson Subject: Re: [GIT PULL] SPEAr clk updates for v-3.5 References: <1336562022-24368-1-git-send-email-viresh.kumar@st.com> In-Reply-To: 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 [207.126.144.115 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "arm@kernel.org" , "viresh.linux@gmail.com" , spear-devel , "linux-arm-kernel@lists.infradead.org" , "Turquette, Mike" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On 5/10/2012 12:44 PM, Olof Johansson wrote: > Russell has published a clkdev branch that you pull instead of > applying his patch manually, that way there will be no surprises with > respect to conflicts, etc: > > git://ftp.arm.linux.org.uk/~rmk/linux-next.git clkdev Sure, Please check below pull request. I will reply on other pull requests too. The following changes since commit 31947e6af9150f93f3df5544550504ae8ce3a052: Merge branch 'spear/dt'; branch 'spear/pinctrl'; rmk/clkdev into mike/clk-next (2012-05-10 16:11:11 +0530) are available in the git repository at: git://git.stlinux.com/spear/linux-2.6.git for-v3.5-spear-clk for you to fetch changes up to 6723741b37f5463593c6d5338c5dbffe311c877c: SPEAr: Switch to common clock framework (2012-05-10 16:15:05 +0530) ---------------------------------------------------------------- Viresh Kumar (6): SPEAr: clk: Add VCO-PLL Synthesizer clock SPEAr: clk: Add Auxiliary Synthesizer clock SPEAr: clk: Add Fractional Synthesizer clock SPEAr: clk: Add General Purpose Timer Synthesizer clock SPEAr: Call clk_prepare() before calling clk_enable SPEAr: Switch to common clock framework MAINTAINERS | 4 +- arch/arm/Kconfig | 1 + arch/arm/mach-spear3xx/Makefile | 2 +- arch/arm/mach-spear3xx/clock.c | 892 -------------------- arch/arm/mach-spear3xx/include/mach/generic.h | 4 +- arch/arm/mach-spear3xx/include/mach/misc_regs.h | 2 + arch/arm/mach-spear3xx/include/mach/spear.h | 13 + arch/arm/mach-spear3xx/spear300.c | 1 - arch/arm/mach-spear3xx/spear310.c | 1 - arch/arm/mach-spear3xx/spear320.c | 12 +- arch/arm/mach-spear3xx/spear3xx.c | 2 + arch/arm/mach-spear6xx/Makefile | 2 +- arch/arm/mach-spear6xx/clock.c | 789 ------------------ arch/arm/mach-spear6xx/include/mach/misc_regs.h | 2 + arch/arm/mach-spear6xx/spear6xx.c | 5 +- arch/arm/plat-spear/Makefile | 2 +- arch/arm/plat-spear/clock.c | 1005 ----------------------- arch/arm/plat-spear/include/plat/clock.h | 249 ------ arch/arm/plat-spear/time.c | 8 +- drivers/clk/Makefile | 3 + drivers/clk/spear/Makefile | 8 + drivers/clk/spear/clk-aux-synth.c | 198 +++++ drivers/clk/spear/clk-frac-synth.c | 165 ++++ drivers/clk/spear/clk-gpt-synth.c | 154 ++++ drivers/clk/spear/clk-vco-pll.c | 363 ++++++++ drivers/clk/spear/clk.c | 36 + drivers/clk/spear/clk.h | 134 +++ drivers/clk/spear/spear3xx_clock.c | 612 ++++++++++++++ drivers/clk/spear/spear6xx_clock.c | 342 ++++++++ 29 files changed, 2056 insertions(+), 2955 deletions(-) delete mode 100644 arch/arm/mach-spear3xx/clock.c delete mode 100644 arch/arm/mach-spear6xx/clock.c delete mode 100644 arch/arm/plat-spear/clock.c delete mode 100644 arch/arm/plat-spear/include/plat/clock.h create mode 100644 drivers/clk/spear/Makefile create mode 100644 drivers/clk/spear/clk-aux-synth.c create mode 100644 drivers/clk/spear/clk-frac-synth.c create mode 100644 drivers/clk/spear/clk-gpt-synth.c create mode 100644 drivers/clk/spear/clk-vco-pll.c create mode 100644 drivers/clk/spear/clk.c create mode 100644 drivers/clk/spear/clk.h create mode 100644 drivers/clk/spear/spear3xx_clock.c create mode 100644 drivers/clk/spear/spear6xx_clock.c