From patchwork Mon Oct 3 07:41:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 117408 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 A9EA2B6F7E for ; Mon, 3 Oct 2011 18:41:35 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RAd9S-0007B3-Rk; Mon, 03 Oct 2011 07:41:26 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RAd9S-0000wI-Ep; Mon, 03 Oct 2011 07:41:26 +0000 Received: from mail-pz0-f43.google.com ([209.85.210.43]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RAd9P-0000vy-LS for linux-arm-kernel@lists.infradead.org; Mon, 03 Oct 2011 07:41:24 +0000 Received: by pzd13 with SMTP id 13so11331417pzd.2 for ; Mon, 03 Oct 2011 00:41:21 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.6.98 with SMTP id z2mr79048142pbz.36.1317627681234; Mon, 03 Oct 2011 00:41:21 -0700 (PDT) Received: by 10.142.47.14 with HTTP; Mon, 3 Oct 2011 00:41:21 -0700 (PDT) In-Reply-To: References: Date: Mon, 3 Oct 2011 09:41:21 +0200 Message-ID: Subject: Re: [GIT PULL] ux500-timers From: Linus Walleij To: Arnd Bergmann X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111003_034123_837199_0F5A8AD8 X-CRM114-Status: GOOD ( 11.11 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.43 listed in list.dnswl.org] Cc: Thomas Gleixner , Jonas ABERG , linux-arm-kernel@lists.infradead.org, Mattias WALLIN X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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, could you please pull the updated ux500 timer branch into the arm-soc tree? The following changes since commit d93dc5c4478c1fd5de85a3e8aece9aad7bbae044: Linux 3.1-rc7 (2011-09-21 16:58:15 -0700) are available in the git repository at: git://git.linaro.org/people/triad/linux-stericsson.git ux500-nomadik-timers Jonas Aaberg (4): ARM: ux500: Move timer code to separate file ARM: plat-nomadik: timer: Add support for periodic timers ARM: plat-nomadik: timer: Export reset functions ARM: ux500: Reprogram timers upon resume Linus Walleij (1): clocksource: fixup ux500 build problems Mattias Wallin (3): ARM: plat-nomadik: MTU sched_clock as an option clocksource: add DBX500 PRCMU Timer support ARM: ux500: add support for clocksource DBX500 PRCMU arch/arm/mach-ux500/Makefile | 2 +- arch/arm/mach-ux500/cpu.c | 29 +----- arch/arm/mach-ux500/include/mach/db5500-regs.h | 2 + arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 + arch/arm/mach-ux500/timer.c | 68 ++++++++++++ arch/arm/plat-nomadik/Kconfig | 8 ++- arch/arm/plat-nomadik/include/plat/mtu.h | 47 +-------- arch/arm/plat-nomadik/timer.c | 138 ++++++++++++++++++------ drivers/clocksource/Kconfig | 15 +++ drivers/clocksource/Makefile | 1 + drivers/clocksource/clksrc-dbx500-prcmu.c | 106 ++++++++++++++++++ include/linux/clksrc-dbx500-prcmu.h | 20 ++++ 12 files changed, 333 insertions(+), 106 deletions(-) create mode 100644 arch/arm/mach-ux500/timer.c create mode 100644 drivers/clocksource/clksrc-dbx500-prcmu.c create mode 100644 include/linux/clksrc-dbx500-prcmu.h