From patchwork Fri May 4 17:05:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 156971 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 70134B6FD7 for ; Sat, 5 May 2012 03:07:40 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SQLwx-0002pr-G8; Fri, 04 May 2012 17:05:47 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SQLws-0002o9-Ej for linux-arm-kernel@lists.infradead.org; Fri, 04 May 2012 17:05:43 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SQLwn-0005tW-Sy; Fri, 04 May 2012 19:05:37 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.77) (envelope-from ) id 1SQLwj-0005r7-Q0; Fri, 04 May 2012 19:05:33 +0200 Date: Fri, 4 May 2012 19:05:33 +0200 From: Sascha Hauer To: linux-arm-kernel@lists.infradead.org Subject: [GIT PULL] clk for next Message-ID: <20120504170533.GO4141@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 18:50:39 up 174 days, 37 min, 73 users, load average: 0.08, 1.01, 3.86 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Saravana Kannan , Arnd Bergmann , "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 Erm, no, this is not a pull request, more a request for a pull request. Currently we are still missing the clk patches for next in -next. It should be fine to have these in arm-soc since probably no non-arm architecture will convert to the clock framework in the next two weeks. Then finally we could merge SoC clk code in the arm-soc tree. BTW there are lready spear clk patches in the arm-soc tree which conflict with Mikes branch so Viresh might have to fix them (maybe he sent the fixes already to the list, can't remember) So Mike, please consider sending the following pull request to Arnd: The following changes since commit 66f75a5d028beaf67c931435fdc3e7823125730c: Linux 3.4-rc4 (2012-04-21 14:47:52 -0700) are available in the git repository at: git://git.linaro.org/people/mturquette/linux.git clk-next for you to fetch changes up to 0e1c03017549a9df513622b3f15ff38eb8d35a62: clk: clk_set_rate() must fail if CLK_SET_RATE_GATE is set and clk is enabled (2012-05-01 18:13:38 -0700) ---------------------------------------------------------------- Mark Brown (2): clk: Remove comment for end of CONFIG_COMMON_CLK section clk: Constify parent name arrays Mike Turquette (6): clk: core: correct clk_set_rate kerneldoc clk: core: remove dead code paths clk: core: clk_calc_new_rates handles NULL parents clk: core: enforce clk_ops consistency clk: core: copy parent_names & return error codes clk: basic: improve parent_names & return errors Rajendra Nayak (2): clk: Make clk_get_rate() return 0 on error clk: constify parent name arrays in macros Rob Herring (2): clk: select CLKDEV_LOOKUP for COMMON_CLK clk: remove trailing whitespace from clk.h Saravana Kannan (1): clk: Use a separate struct for holding init data. Shawn Guo (7): clk: use kzalloc in clk_register_mux clk: remove unnecessary EXPORT_SYMBOL_GPL clk: add "const" for clk_ops of basic clks clk: declare clk_ops of basic clks in clk-provider.h clk: always pass parent_rate into .round_rate clk: pass parent_rate into .set_rate clk: propagate round_rate for CLK_SET_RATE_PARENT case Viresh Kumar (5): clk: Fix typo in comment clk: clk-gate: Create clk_gate_endisable() clk: clk-private: Add DEFINE_CLK macro clk: Don't set clk->new_rate twice clk: clk_set_rate() must fail if CLK_SET_RATE_GATE is set and clk is enabled drivers/clk/Kconfig | 1 + drivers/clk/clk-divider.c | 68 +++++------ drivers/clk/clk-fixed-rate.c | 49 ++++---- drivers/clk/clk-gate.c | 104 ++++++++--------- drivers/clk/clk-mux.c | 26 +++-- drivers/clk/clk.c | 265 +++++++++++++++++++++++++++--------------- include/linux/clk-private.h | 79 +++++-------- include/linux/clk-provider.h | 95 ++++++++------- include/linux/clk.h | 6 +- 9 files changed, 383 insertions(+), 310 deletions(-)