mbox

[GIT,PULL,4/5] am33xx data for v3.6 merge window

Message ID E1SoaA9-0001Je-6V@merlin.infradead.org
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-data-for-v3.6

Message

Tony Lindgren July 10, 2012, 1:05 p.m. UTC
The following changes since commit ecc46cfdad7499a21296f0757059c4965f1fbc98:

  ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals (2012-07-05 08:05:15 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-data-for-v3.6

for you to fetch changes up to 79ab2664336d73245023a236345bb31f2b0a2dfe:

  Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx-data (2012-07-05 08:18:04 -0700)

----------------------------------------------------------------

This branch adds clock data for am33xx. Note that eventually these
will use the common clock framework, but those patches are not quite
ready yet for omaps. This branch depends on omap-cleanup-part2-for-v3.6
branch.

----------------------------------------------------------------
Paul Walmsley (1):
      ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file

Tony Lindgren (1):
      Merge tag 'omap-devel-e-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx-data

Vaibhav Hiremath (1):
      ARM: OMAP3+: clock33xx: Add AM33XX clock tree data

 arch/arm/mach-omap2/Makefile                  |    1 +
 arch/arm/mach-omap2/clock.h                   |   14 +
 arch/arm/mach-omap2/clock33xx_data.c          | 1105 +++++++++++++++++++++++++
 arch/arm/mach-omap2/clock3xxx_data.c          |   20 +-
 arch/arm/mach-omap2/clock44xx_data.c          |   72 --
 arch/arm/mach-omap2/clock_common_data.c       |   77 ++
 arch/arm/mach-omap2/io.c                      |    2 +
 arch/arm/plat-omap/include/plat/clkdev_omap.h |    1 +
 8 files changed, 1204 insertions(+), 88 deletions(-)
 create mode 100644 arch/arm/mach-omap2/clock33xx_data.c