| Message ID | 1343075561-17446-8-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show
Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org> X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DF86F2402A for <patchwork@peony.canonical.com>; Mon, 23 Jul 2012 20:32:49 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 93514A1804F for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 20:32:49 +0000 (UTC) Received: by ghbz12 with SMTP id z12so6272269ghb.11 for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 13:32:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=zZtEy9+s/78VUJ7mNpACBrGAbf9S0uZgZx8S6iAKo/s=; b=bhesv+bg0jEOUdyq0d+mjAJ3tvKouzOjQ3UQDxtyGcIvYOba2TcGcSSGu1k6sdhRWH +nti/f4c+wSsBw01xwwfGS50iXQwJMgAcFhe3ex8/02MCqGZOv7tbfEYD3blyfyHPY4S mblshFSg9PIk55e5QVSCn2IZjtf6imn8X5LlUVwrc9M7bYZY1XLAG41aADe28UIWILbt WEQLKIj+8clEuqGxyWrwAjQmCofdWv8K7izJ4kWudUogOAgLbAAH67gIEDruuyGFPprI 7iG530PG6j/KSD0vuTiNZDFLd7Rie0OBjd53ZBjwuvagqwlAIWA3aPs8gPEOULpo2Ych HlTA== Received: by 10.42.155.200 with SMTP id v8mr9511810icw.12.1343075568883; Mon, 23 Jul 2012 13:32:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp61680ibw; Mon, 23 Jul 2012 13:32:48 -0700 (PDT) Received: by 10.217.0.145 with SMTP id l17mr6743103wes.133.1343075567618; Mon, 23 Jul 2012 13:32:47 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTP id b57si13765222wef.8.2012.07.23.13.32.46; Mon, 23 Jul 2012 13:32:47 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0Lzrgx-1TxYmU3eUd-0154r9; Mon, 23 Jul 2012 22:32:46 +0200 From: Arnd Bergmann <arnd@arndb.de> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org Subject: [GIT PULL 07/15] arm-soc: timer updates Date: Mon, 23 Jul 2012 22:32:33 +0200 Message-Id: <1343075561-17446-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1343075561-17446-1-git-send-email-arnd@arndb.de> References: <1343075561-17446-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:f2Vi6KwMmS6pWM+1N1RYO9Rs5iq1uQp+kcQtrUgT/8H HOnl+ukIZTe8pGccnvOe/QkVU06+sFxo10X6Z/umXWhAxbxmIr JBELokBUkwkTjrEkUk9H3Jnl8p4DCh1aZ+UgoGEGQi+VsnlXZM UOMMY3nVA+9z4qfL3MJ5TVgHdhK1Ex+JpQjed4le9db+3p5rVl PqoUGlTE1abWotwT0gIWlremPFO+5JGWbPaJWx7YK6j6fwle+8 UVJKHpi2+xKoA4wxo02zXFA88Z704jG70tzzLZaykED2JYevWv VRCkCJAjAayTb6mfoecxJe4QBW/7V0Lku+z7TNO/eBl/TpBGhz TpHvdsRkYIYCWQDiP15ZiGnx40z7ZAwwupV7ngPu8 X-Gm-Message-State: ALoCoQlUuc+E4q5SWUEEu4vTnhZQ+1KlIMVAisUJWrxs91IiFD0XrcIgHF8sRh7ovLpdwat02VPQ |
The following changes since commit bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a: Linux 3.5-rc6 (2012-07-07 17:23:56 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/timer for you to fetch changes up to 35bf8cc74b2b1dfad18df6d330b271e68ab6e3f5: Merge branch 'picoxcell/timer' into next/timer (2012-07-12 17:27:36 +0200) ---------------------------------------------------------------- arm-soc: timer updates This contains two branches dealing with timers, one for the picoxcell platform that is now using DT with the platform-independent dw_apb_timer driver. The other change is for the omap-specific dmtimer driver. ---------------------------------------------------------------- Arnd Bergmann (3): Merge tag 'omap-devel-dmtimer-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/timer Merge branch 'picoxcell/timer' into next/timer Merge branch 'next/timer' into for-next Dinh Nguyen (1): clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer Jon Hunter (12): ARM: OMAP: Remove unnecessary clk structure ARM: OMAP2+: Remove unused max number of timers definition ARM: OMAP2+: Add dmtimer platform function to reserve systimers ARM: OMAP: Add DMTIMER capability variable to represent timer features ARM: OMAP2+: HWMOD: Correct timer device attributes ARM: OMAP2+: Fix external clock support for dmtimers ARM: OMAP: Remove loses_context variable from timer platform data ARM: OMAP: Remove timer function pointer for context loss counter ARM: OMAP: Add flag to indicate if a timer needs a manual reset ARM: OMAP1: Fix dmtimer support ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver ARM: OMAP2+: Simplify dmtimer clock aliases Documentation/devicetree/bindings/rtc/dw-apb.txt | 25 +++++ arch/arm/Kconfig | 1 + arch/arm/mach-omap1/timer.c | 3 +- arch/arm/mach-omap2/clock2420_data.c | 39 +------ arch/arm/mach-omap2/clock2430_data.c | 39 +------ arch/arm/mach-omap2/clock3xxx_data.c | 26 +---- arch/arm/mach-omap2/clock44xx_data.c | 34 +++--- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 -- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 -- arch/arm/mach-omap2/timer.c | 82 +-------------- arch/arm/mach-picoxcell/Makefile | 1 - arch/arm/mach-picoxcell/common.c | 3 +- arch/arm/mach-picoxcell/common.h | 2 +- arch/arm/plat-omap/dmtimer.c | 111 +++++++++++++++----- arch/arm/plat-omap/include/plat/dmtimer.h | 22 +--- drivers/clocksource/Kconfig | 3 + drivers/clocksource/Makefile | 1 + .../clocksource/dw_apb_timer_of.c | 52 +++++---- 19 files changed, 182 insertions(+), 286 deletions(-)