From patchwork Thu May 10 18:39:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 158372 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 89464B6F9F for ; Fri, 11 May 2012 04:43:57 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SSYJ1-0006UJ-Ec; Thu, 10 May 2012 18:41:39 +0000 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SSYGy-0005b5-Vx for linux-arm-kernel@lists.infradead.org; Thu, 10 May 2012 18:39:38 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1SSYGx-0000CF-2c; Thu, 10 May 2012 18:39:31 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX190aGAISTc6XlXfttMV+pXp Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.028 (F2.82; T1.34; A2.08; B3.13; Q3.13) Date: Thu, 10 May 2012 11:39:19 -0700 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 8/10] omap timer cleanup for v3.5 merge window In-Reply-To: X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.71 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.5 MISSING_MID Missing Message-Id: header Cc: linux-omap@vger.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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Message-ID: Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The following changes since commit bfd17879866b36e95c58721da070d9f2ac7f8901: Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-timer-for-v3.5 for you to fetch changes up to 1fe97c8f6a1de67a5f56e029a818903d5bed8017: ARM: OMAP: Make OMAP clocksource source selection using kernel param (2012-05-09 10:07:05 -0700) ---------------------------------------------------------------- Timer changes to make it easier to support various SoCs ---------------------------------------------------------------- Vaibhav Hiremath (3): ARM: OMAP1: Add checks for possible error condition in timer_init ARM: OMAP2+: Replace space with underscore in the name field of system timers ARM: OMAP: Make OMAP clocksource source selection using kernel param arch/arm/mach-omap1/common.h | 9 ++- arch/arm/mach-omap1/time.c | 16 +--- arch/arm/mach-omap1/timer32k.c | 28 ++++++- arch/arm/mach-omap2/timer.c | 118 +++++++++++++++++++++++------- arch/arm/plat-omap/counter_32k.c | 91 ++++++++++------------- arch/arm/plat-omap/include/plat/common.h | 2 +- 6 files changed, 166 insertions(+), 98 deletions(-)