From patchwork Thu May 17 09:41:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 159875 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 35861B6FA4 for ; Thu, 17 May 2012 19:43:49 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SUxDB-0001j4-OQ; Thu, 17 May 2012 09:41:33 +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 1SUxD8-0001iq-67 for linux-arm-kernel@lists.infradead.org; Thu, 17 May 2012 09:41:31 +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 1SUxD1-0002Mh-HK; Thu, 17 May 2012 11:41:23 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.77) (envelope-from ) id 1SUxCz-0008I1-JC; Thu, 17 May 2012 11:41:21 +0200 Date: Thu, 17 May 2012 11:41:21 +0200 From: Sascha Hauer To: Arnd Bergmann Subject: [GIT PULL] i.MX common clock fixes Message-ID: <20120517094121.GY30400@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: 11:39:14 up 186 days, 17:26, 16 users, load average: 0.04, 0.11, 0.11 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: Olof Johansson , linux-arm-kernel@lists.infradead.org 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 Hi Arnd, Olof, Please pull the following fixes to the i.MX common clock conversion based on the imx/clock branch in arm-soc. Thanks Sascha The following changes since commit 4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1: Merge branch 'imx/pinctrl' into imx/clock (2012-05-14 15:30:52 +0200) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-clk-common-fixes for you to fetch changes up to b0286f20c36d0c1e7537489daddaf574abf403dd: ARM: imx6q: prepare and enable init on clks directly instead of clk_get first (2012-05-16 12:46:23 +0200) ---------------------------------------------------------------- Some fixes for the fresh i.MX common clock support ---------------------------------------------------------------- Richard Zhao (2): ARM: i.MX: change timer clock from ipg to perclk ARM: imx6q: prepare and enable init on clks directly instead of clk_get first Sascha Hauer (2): ARM i.MX5: fix gpt peripheral clock path ARM i.MX: remove now unnecessary argument from mxc_timer_init arch/arm/mach-imx/clk-imx1.c | 3 +-- arch/arm/mach-imx/clk-imx21.c | 4 ++-- arch/arm/mach-imx/clk-imx25.c | 2 +- arch/arm/mach-imx/clk-imx27.c | 3 +-- arch/arm/mach-imx/clk-imx31.c | 3 +-- arch/arm/mach-imx/clk-imx35.c | 6 ++---- arch/arm/mach-imx/clk-imx51-imx53.c | 12 +++++------- arch/arm/mach-imx/clk-imx6q.c | 22 +++++++--------------- arch/arm/plat-mxc/epit.c | 11 ++++++++++- arch/arm/plat-mxc/include/mach/common.h | 4 ++-- arch/arm/plat-mxc/time.c | 24 ++++++++++++------------ 11 files changed, 44 insertions(+), 50 deletions(-)