From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Nicolas Pitre <nico@fluxnic.net>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [GIT PULL] omap cleanup for v3.1 merge window, part 3
Date: Mon, 11 Jul 2011 04:49:32 -0700 [thread overview]
Message-ID: <20110711114931.GY5783@atomide.com> (raw)
In-Reply-To: <20110711114736.GX5783@atomide.com>
The following changes since commit ecba3287b4121dcf3ca7607fe71c205913edec06:
Arnd Bergmann (1):
Merge branch 'cleanup-part-2' of git+ssh://master.kernel.org/.../tmlind/linux-omap-2.6 into omap/cleanup
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git cleanup-part-3
Benoit Cousson (21):
OMAP2+: hwmod: Fix smart-standby + wakeup support
OMAP4: hwmod data: Add MSTANDBY_SMART_WKUP flag
OMAP2+: hwmod: Do not write the enawakeup bit if SYSC_HAS_ENAWAKEUP is not set
OMAP2+: hwmod: Remove _populate_mpu_rt_base warning
OMAP2+: hwmod: Fix the HW reset management
OMAP: hwmod: Add warnings if enable failed
OMAP: hwmod: Move pr_debug to improve the readability
OMAP4: hwmod data: Fix L3 interconnect data order and alignement
OMAP4: hwmod data: Remove un-needed parens
OMAP4: hwmod data: Fix bad alignement
OMAP4: hwmod data: Align interconnect format with regular modules
OMAP4: clock data: Add sddiv to USB DPLL
OMAP4: clock data: Remove usb_host_fs clkdev with NULL dev
OMAP4: clock data: Re-order some clock nodes and structure fields
OMAP4: clock data: Fix max mult and div for USB DPLL
OMAP4: prcm: Fix errors in few defines name
OMAP4: prm: Remove wrong clockdomain offsets
OMAP4: powerdomain data: Fix indentation
OMAP4: cm: Remove RESTORE macros to avoid access from SW
OMAP4: prcm_mpu: Fix indent in few macros
OMAP4: clockdomain data: Fix data order and wrong name
Jean Pihet (1):
OMAP PM: remove OMAP_PM_NONE config option
Jon Hunter (2):
OMAP4: clock data: Remove McASP2, McASP3 and MMC6 clocks
OMAP4: clock data: Remove UNIPRO clock nodes
Kevin Hilman (1):
OMAP: omap_device: replace _find_by_pdev() with to_omap_device()
Miguel Vadillo (1):
OMAP2+: hwmod: Enable module in shutdown to access sysconfig
Paul Walmsley (9):
OMAP: dmtimer: add missing include
omap_hwmod: use a null structure record to terminate omap_hwmod_addr_space arrays
omap_hwmod: share identical omap_hwmod_addr_space arrays
omap_hwmod: use a terminator record with omap_hwmod_mpu_irqs arrays
omap_hwmod: share identical omap_hwmod_mpu_irqs arrays
omap_hwmod: use a terminator record with omap_hwmod_dma_info arrays
omap_hwmod: share identical omap_hwmod_dma_info arrays
omap_hwmod: share identical omap_hwmod_class, omap_hwmod_class_sysconfig arrays
Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_hwmod_3.1', 'omap4_hwmod_data_cleanup_a_3.1', 'clock_cleanup_a_3.1', 'prcm_cleanup_a_3.1', 'omap_pm_cleanup_3.1' and 'omap_device_cleanup_3.1' into prcm-cleanup-3.1
Russell King - ARM Linux (1):
Convert OMAPs 32kHz clocksource implementation to use the generic MMIO clocksource support. This achieves several things:
Tony Lindgren (1):
Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into cleanup-part-3
arch/arm/Kconfig | 1 +
arch/arm/mach-omap2/Makefile | 16 +-
arch/arm/mach-omap2/clock44xx.h | 7 -
arch/arm/mach-omap2/clock44xx_data.c | 237 ++----
arch/arm/mach-omap2/clockdomains44xx_data.c | 124 ++--
arch/arm/mach-omap2/cm-regbits-44xx.h | 623 ++++++--------
arch/arm/mach-omap2/cm1_44xx.h | 64 +--
arch/arm/mach-omap2/cm2_44xx.h | 73 +--
arch/arm/mach-omap2/omap_hwmod.c | 223 ++++--
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 832 +++----------------
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 910 +++-----------------
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 173 ++++
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 322 +++++++
.../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 130 +++
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 150 ++++
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 654 +++-----------
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 472 +++++-----
arch/arm/mach-omap2/omap_hwmod_common_data.c | 20 -
arch/arm/mach-omap2/omap_hwmod_common_data.h | 93 ++-
arch/arm/mach-omap2/powerdomains44xx_data.c | 18 +-
arch/arm/mach-omap2/prcm_mpu44xx.h | 69 +-
arch/arm/mach-omap2/prm44xx.h | 34 +-
arch/arm/plat-omap/Kconfig | 3 -
arch/arm/plat-omap/counter_32k.c | 121 +--
arch/arm/plat-omap/include/plat/clock.h | 2 +-
arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
arch/arm/plat-omap/include/plat/omap-pm.h | 8 -
arch/arm/plat-omap/include/plat/omap_hwmod.h | 20 +-
arch/arm/plat-omap/omap_device.c | 15 +-
29 files changed, 2152 insertions(+), 3263 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
next prev parent reply other threads:[~2011-07-11 11:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-11 11:47 Remaining omap pull requests Tony Lindgren
2011-07-11 11:47 ` Tony Lindgren
2011-07-11 11:49 ` Tony Lindgren [this message]
2011-07-11 11:50 ` [GIT PULL] omap fixes for v3.1 merge window, part 2 Tony Lindgren
2011-07-11 11:53 ` [GIT PULL] omap related MFD and ASoC patches for v3.1 merge window Tony Lindgren
2011-07-11 11:53 ` Tony Lindgren
2011-07-11 22:16 ` Remaining omap pull requests Arnd Bergmann
2011-07-11 22:16 ` Arnd Bergmann
2011-07-13 6:16 ` Tony Lindgren
2011-07-13 6:16 ` Tony Lindgren
2011-08-02 23:14 ` Kevin Hilman
2011-08-02 23:14 ` Kevin Hilman
2011-08-03 0:06 ` Kevin Hilman
2011-08-03 0:06 ` Kevin Hilman
2011-08-10 12:21 ` Tony Lindgren
2011-08-10 12:21 ` Tony Lindgren
2011-08-16 14:07 ` Arnd Bergmann
2011-08-16 14:07 ` Arnd Bergmann
2011-07-12 8:41 ` Jan Weitzel
2011-07-12 8:41 ` Jan Weitzel
2011-07-13 6:25 ` Tony Lindgren
2011-07-13 6:25 ` Tony Lindgren
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=20110711114931.GY5783@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=tglx@linutronix.de \
/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.