All of lore.kernel.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1343075561-17446-8-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1343075561-17446-1-git-send-email-arnd@arndb.de>

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(-)

WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 07/15] arm-soc: timer updates
Date: Mon, 23 Jul 2012 20:33:22 -0000	[thread overview]
Message-ID: <1343075561-17446-8-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1343075561-17446-1-git-send-email-arnd@arndb.de>

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(-)

  parent reply	other threads:[~2012-07-23 20:33 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-23 20:32 [GIT PULL 00/15] arm-soc: changes for v3.6 Arnd Bergmann
2012-07-23 20:32 ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 01/15] arm-soc: non-critical bug fixes Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 02/15] arm-soc: general cleanups Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 03/15] arm-soc: soc-specific updates Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 04/15] arm-soc: samsung dma changes Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 05/15] arm-soc: device tree description updates Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 06/15] arm-soc: spi updates Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` Arnd Bergmann [this message]
2012-07-23 20:33   ` [GIT PULL 07/15] arm-soc: timer updates Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 08/15] arm-soc: cleanups, part 2 Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 09/15] arm-soc: new SoC support Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 10/15] arm-soc: defconfig updates Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 11/15] arm-soc: board specific updates Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 12/15] arm-soc: sparse IRQ conversion Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 13/15] arm-soc: pincontrol drivers Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 14/15] arm-soc: power management changes Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-23 20:32 ` [GIT PULL 15/15] arm-soc: clk changes Arnd Bergmann
2012-07-23 20:33   ` Arnd Bergmann
2012-07-24  1:03 ` [GIT PULL 00/15] arm-soc: changes for v3.6 Linus Torvalds
2012-07-24  1:03   ` Linus Torvalds
2012-07-24  7:51   ` Arnd Bergmann
2012-07-24  7:51     ` Arnd Bergmann
2012-07-24  8:12     ` Tony Lindgren
2012-07-24  8:12       ` Tony Lindgren
2012-07-24 12:00       ` Arnd Bergmann
2012-07-24 12:00         ` Arnd Bergmann
2012-07-24 20:51     ` Paul Walmsley
2012-07-24 20:51       ` Paul Walmsley
2012-07-26 23:10       ` Mark A. Greer
2012-07-26 23:10         ` Mark A. Greer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1343075561-17446-8-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=arm@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.