* Pull request for OMAP PM, clock, SDRC 2.6.32 patches
@ 2009-08-16 13:45 Paul Walmsley
2009-08-17 17:09 ` Russell King - ARM Linux
0 siblings, 1 reply; 7+ messages in thread
From: Paul Walmsley @ 2009-08-16 13:45 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-xIg/pKzrS19vn6HldHNs0ANdhmdF6hFW,
linux-arm-u79uwXL29TY76Z2rM5mHXA,
hiroshi.doyu-xNZwKgViW5gAvxtiuMwx3w
Hello Russell,
Here's the pull request for the thirteen patches posted earlier, plus
Hiroshi's clock debugfs error path fix.
regards,
- Paul
The following changes since commit 3b3119fc549c93df60316d28bdd77c2de3986588:
Russell King (1):
Merge branch 'ixp4xx-fixes' of git://git.kernel.org/.../chris/linux-2.6
are available in the git repository at:
git://git.pwsan.com/linux-2.6 2_6_32_merge
Hiroshi DOYU (1):
OMAP clock: use debugfs_remove_recursive() for rewinding
Paul Walmsley (11):
OMAP: powerdomain: Fix overflow when doing powerdomain deps lookups
OMAP2/3 clock: ensure each clock has a unique name
OMAP clock: add omap_clk_get_by_name()
OMAP clock: associate MPU clocks with the mpu_clkdm
OMAP3 clock: remove superfluous calls to omap2_init_clk_clkdm
OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no-op layer
OMAP2/3/4 PRCM: add module IDLEST wait code
OMAP2/3 board-*.c files: read bootloader configuration earlier
OMAP2/3/4: create omap_hwmod layer
OMAP: omap_hwmod: call omap_hwmod init at boot; create interconnects
OMAP2/3/4 core: create omap_device layer
Sanjeev Premi (1):
OMAP3 clock: Fixed processing of bootarg 'mpurate'
Tero Kristo (1):
OMAP: SDRC: Add several new register definitions
Documentation/arm/OMAP/omap_pm | 129 ++
arch/arm/mach-omap2/Makefile | 7 +-
arch/arm/mach-omap2/board-2430sdp.c | 17 +-
arch/arm/mach-omap2/board-3430sdp.c | 18 +-
arch/arm/mach-omap2/board-apollon.c | 20 +-
arch/arm/mach-omap2/board-generic.c | 14 +-
arch/arm/mach-omap2/board-h4.c | 20 +-
arch/arm/mach-omap2/board-ldp.c | 20 +-
arch/arm/mach-omap2/board-omap3beagle.c | 26 +-
arch/arm/mach-omap2/board-omap3evm.c | 14 +-
arch/arm/mach-omap2/board-omap3pandora.c | 20 +-
arch/arm/mach-omap2/board-overo.c | 20 +-
arch/arm/mach-omap2/board-rx51.c | 4 +-
arch/arm/mach-omap2/board-zoom2.c | 18 +-
arch/arm/mach-omap2/clock24xx.h | 52 +-
arch/arm/mach-omap2/clock34xx.c | 17 +-
arch/arm/mach-omap2/clock34xx.h | 81 +-
arch/arm/mach-omap2/cm.c | 70 ++
arch/arm/mach-omap2/cm.h | 4 +
arch/arm/mach-omap2/cm4xxx.c | 68 ++
arch/arm/mach-omap2/io.c | 23 +-
arch/arm/mach-omap2/omap_hwmod.c | 1552 +++++++++++++++++++++++++
arch/arm/mach-omap2/omap_hwmod_2420.h | 140 +++
arch/arm/mach-omap2/omap_hwmod_2430.h | 142 +++
arch/arm/mach-omap2/omap_hwmod_34xx.h | 167 +++
arch/arm/mach-omap2/powerdomain.c | 4 +-
arch/arm/mach-omap2/serial.c | 11 +-
arch/arm/plat-omap/Kconfig | 13 +
arch/arm/plat-omap/Makefile | 5 +
arch/arm/plat-omap/clock.c | 29 +-
arch/arm/plat-omap/include/mach/clock.h | 1 +
arch/arm/plat-omap/include/mach/omap-pm.h | 301 +++++
arch/arm/plat-omap/include/mach/omap_device.h | 141 +++
arch/arm/plat-omap/include/mach/omap_hwmod.h | 438 +++++++
arch/arm/plat-omap/include/mach/sdrc.h | 9 +
arch/arm/plat-omap/include/mach/serial.h | 3 +
arch/arm/plat-omap/omap-pm-noop.c | 296 +++++
arch/arm/plat-omap/omap_device.c | 687 +++++++++++
38 files changed, 4405 insertions(+), 196 deletions(-)
create mode 100644 Documentation/arm/OMAP/omap_pm
create mode 100644 arch/arm/mach-omap2/cm.c
create mode 100644 arch/arm/mach-omap2/cm4xxx.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_2420.h
create mode 100644 arch/arm/mach-omap2/omap_hwmod_2430.h
create mode 100644 arch/arm/mach-omap2/omap_hwmod_34xx.h
create mode 100644 arch/arm/plat-omap/include/mach/omap-pm.h
create mode 100644 arch/arm/plat-omap/include/mach/omap_device.h
create mode 100644 arch/arm/plat-omap/include/mach/omap_hwmod.h
create mode 100644 arch/arm/plat-omap/omap-pm-noop.c
create mode 100644 arch/arm/plat-omap/omap_device.c
--
To unsubscribe from this list: send the line "unsubscribe linux-arm" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: Pull request for OMAP PM, clock, SDRC 2.6.32 patches 2009-08-16 13:45 Pull request for OMAP PM, clock, SDRC 2.6.32 patches Paul Walmsley @ 2009-08-17 17:09 ` Russell King - ARM Linux [not found] ` <20090817170921.GT10764-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 0 siblings, 1 reply; 7+ messages in thread From: Russell King - ARM Linux @ 2009-08-17 17:09 UTC (permalink / raw) To: Paul Walmsley; +Cc: linux-omap, linux-arm-kernel, linux-arm, hiroshi.doyu On Sun, Aug 16, 2009 at 07:45:59AM -0600, Paul Walmsley wrote: > > Hello Russell, > > Here's the pull request for the thirteen patches posted earlier, plus > Hiroshi's clock debugfs error path fix. I'm afraid to say that I think you've left it far too late to send this. I did set a date of the 16th as being the final date to sort out stuff (which was flexible to a degree) but since these patches were only posted on Saturday, and they're still being discussed, I don't think it would make sense for me to pull it today. And this is likely to be the final day that I merge anything into my kernel tree for the next two weeks. > > regards, > > - Paul > > The following changes since commit 3b3119fc549c93df60316d28bdd77c2de3986588: > Russell King (1): > Merge branch 'ixp4xx-fixes' of git://git.kernel.org/.../chris/linux-2.6 That's stupid. Someone publishing _my_ tree, which I make no guarantees about the life of the commits, for other people to base their work on... That's definitely a big FAIL. Luckily for you though, that commit still exists in my tree, and I've asked Linus to pull that set; so essentially it became immutable only last night. Don't base patches on the contents of my tree without talking to me first please. ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <20090817170921.GT10764-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>]
* Re: Pull request for OMAP PM, clock, SDRC 2.6.32 patches [not found] ` <20090817170921.GT10764-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> @ 2009-08-18 12:35 ` Paul Walmsley [not found] ` <alpine.DEB.2.00.0908180621270.7224-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> 2009-08-24 14:29 ` Tony Lindgren 0 siblings, 2 replies; 7+ messages in thread From: Paul Walmsley @ 2009-08-18 12:35 UTC (permalink / raw) To: Russell King - ARM Linux Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-xIg/pKzrS19vn6HldHNs0ANdhmdF6hFW, linux-arm-u79uwXL29TY76Z2rM5mHXA, hiroshi.doyu-xNZwKgViW5gAvxtiuMwx3w Hello Russell, On Mon, 17 Aug 2009, Russell King - ARM Linux wrote: > On Sun, Aug 16, 2009 at 07:45:59AM -0600, Paul Walmsley wrote: > > > > Hello Russell, > > > > Here's the pull request for the thirteen patches posted earlier, plus > > Hiroshi's clock debugfs error path fix. > > I'm afraid to say that I think you've left it far too late to send this. > I did set a date of the 16th as being the final date to sort out stuff > (which was flexible to a degree) but since these patches were only posted > on Saturday, and they're still being discussed, I don't think it would > make sense for me to pull it today. I've dropped the two patches that are being discussed and reposted the remainder. The updated series is here (et seq.): http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 and the pull request is here: http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 - Paul > > And this is likely to be the final day that I merge anything into my > kernel tree for the next two weeks. > > > > regards, > > > > - Paul > > > > The following changes since commit 3b3119fc549c93df60316d28bdd77c2de3986588: > > Russell King (1): > > Merge branch 'ixp4xx-fixes' of git://git.kernel.org/.../chris/linux-2.6 > > That's stupid. Someone publishing _my_ tree, which I make no guarantees > about the life of the commits, for other people to base their work on... > That's definitely a big FAIL. > > Luckily for you though, that commit still exists in my tree, and I've > asked Linus to pull that set; so essentially it became immutable only > last night. > > Don't base patches on the contents of my tree without talking to me first > please. -- To unsubscribe from this list: send the line "unsubscribe linux-arm" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <alpine.DEB.2.00.0908180621270.7224-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>]
* RE: Pull request for OMAP PM, clock, SDRC 2.6.32 patches [not found] ` <alpine.DEB.2.00.0908180621270.7224-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> @ 2009-08-18 23:04 ` Woodruff, Richard [not found] ` <13B9B4C6EF24D648824FF11BE89671620399F63372-EovWT4A8QTWIQmiDNMet8wC/G2K4zDHf@public.gmane.org> 0 siblings, 1 reply; 7+ messages in thread From: Woodruff, Richard @ 2009-08-18 23:04 UTC (permalink / raw) To: Paul Walmsley, Russell King - ARM Linux Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-xIg/pKzrS19vn6HldHNs0ANdhmdF6hFW@public.gmane.org, linux-arm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, hiroshi.doyu-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org, Nayak, Rajendra Hi Paul, > -----Original Message----- > From: linux-omap-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org [mailto:linux-omap- > owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org] On Behalf Of Paul Walmsley > Sent: Tuesday, August 18, 2009 7:36 AM > To: Russell King - ARM Linux > > I'm afraid to say that I think you've left it far too late to send this. > > I did set a date of the 16th as being the final date to sort out stuff > > (which was flexible to a degree) but since these patches were only posted > > on Saturday, and they're still being discussed, I don't think it would > > make sense for me to pull it today. > > I've dropped the two patches that are being discussed and reposted the > remainder. The updated series is here (et seq.): > > http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 > > and the pull request is here: > > http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 Does this series conflict with patches already submitted on OMAP4? http://www.mail-archive.com/linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg15488.html I'm not able to check now but its best to be careful here. Thanks, Richard W. -- To unsubscribe from this list: send the line "unsubscribe linux-arm" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <13B9B4C6EF24D648824FF11BE89671620399F63372-EovWT4A8QTWIQmiDNMet8wC/G2K4zDHf@public.gmane.org>]
* RE: Pull request for OMAP PM, clock, SDRC 2.6.32 patches [not found] ` <13B9B4C6EF24D648824FF11BE89671620399F63372-EovWT4A8QTWIQmiDNMet8wC/G2K4zDHf@public.gmane.org> @ 2009-08-18 23:27 ` Paul Walmsley [not found] ` <alpine.DEB.2.00.0908181720460.23762-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> 0 siblings, 1 reply; 7+ messages in thread From: Paul Walmsley @ 2009-08-18 23:27 UTC (permalink / raw) To: Woodruff, Richard Cc: Russell King - ARM Linux, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-xIg/pKzrS19vn6HldHNs0ANdhmdF6hFW@public.gmane.org, linux-arm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, hiroshi.doyu-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org, Nayak, Rajendra Hello Richard, On Tue, 18 Aug 2009, Woodruff, Richard wrote: > > -----Original Message----- > > From: linux-omap-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org [mailto:linux-omap- > > owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org] On Behalf Of Paul Walmsley > > Sent: Tuesday, August 18, 2009 7:36 AM > > To: Russell King - ARM Linux > > > I've dropped the two patches that are being discussed and reposted the > > remainder. The updated series is here (et seq.): > > > > http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 > > > > and the pull request is here: > > > > http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 > > Does this series conflict with patches already submitted on OMAP4? > > http://www.mail-archive.com/linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg15488.html > > I'm not able to check now but its best to be careful here. The series cannot conflict with Rajendra's patches 1-3, since there are no files in common between the two series. As for patches 4-6, there are comments pending: http://www.mail-archive.com/linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg15568.html - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-arm" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <alpine.DEB.2.00.0908181720460.23762-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>]
* RE: Pull request for OMAP PM, clock, SDRC 2.6.32 patches [not found] ` <alpine.DEB.2.00.0908181720460.23762-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> @ 2009-08-19 0:15 ` Woodruff, Richard 0 siblings, 0 replies; 7+ messages in thread From: Woodruff, Richard @ 2009-08-19 0:15 UTC (permalink / raw) To: Paul Walmsley Cc: Russell King - ARM Linux, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-xIg/pKzrS19vn6HldHNs0ANdhmdF6hFW@public.gmane.org, linux-arm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, hiroshi.doyu-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org, Nayak, Rajendra > From: Paul Walmsley [mailto:paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org] > Sent: Tuesday, August 18, 2009 6:27 PM > To: Woodruff, Richard > The series cannot conflict with Rajendra's patches 1-3, since there are no > files in common between the two series. As for patches 4-6, there are > comments pending: OK, there are recent comments, good, but is it conflicting? Thanks for clarifying, I'm not able to do a check right now and am hoping they don't interfere. Hopefully the series are not all too inter-related. Seems like getting to multiple and smaller feature branches will reduce collisions. Any big branch carries more risk (and potential reward also I suppose). Regards, Richard W. -- To unsubscribe from this list: send the line "unsubscribe linux-arm" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Pull request for OMAP PM, clock, SDRC 2.6.32 patches 2009-08-18 12:35 ` Paul Walmsley [not found] ` <alpine.DEB.2.00.0908180621270.7224-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org> @ 2009-08-24 14:29 ` Tony Lindgren 1 sibling, 0 replies; 7+ messages in thread From: Tony Lindgren @ 2009-08-24 14:29 UTC (permalink / raw) To: Paul Walmsley Cc: Russell King - ARM Linux, linux-omap, linux-arm-kernel, linux-arm, hiroshi.doyu * Paul Walmsley <paul@pwsan.com> [090818 15:35]: > Hello Russell, > > On Mon, 17 Aug 2009, Russell King - ARM Linux wrote: > > > On Sun, Aug 16, 2009 at 07:45:59AM -0600, Paul Walmsley wrote: > > > > > > Hello Russell, > > > > > > Here's the pull request for the thirteen patches posted earlier, plus > > > Hiroshi's clock debugfs error path fix. > > > > I'm afraid to say that I think you've left it far too late to send this. > > I did set a date of the 16th as being the final date to sort out stuff > > (which was flexible to a degree) but since these patches were only posted > > on Saturday, and they're still being discussed, I don't think it would > > make sense for me to pull it today. > > I've dropped the two patches that are being discussed and reposted the > remainder. The updated series is here (et seq.): > > http://marc.info/?l=linux-arm-kernel&m=125059872200340&w=2 > > and the pull request is here: > > http://marc.info/?l=linux-arm-kernel&m=125059845132331&w=2 I've added this into omap for-next branch. Tony > > > - Paul > > > > > And this is likely to be the final day that I merge anything into my > > kernel tree for the next two weeks. > > > > > > regards, > > > > > > - Paul > > > > > > The following changes since commit 3b3119fc549c93df60316d28bdd77c2de3986588: > > > Russell King (1): > > > Merge branch 'ixp4xx-fixes' of git://git.kernel.org/.../chris/linux-2.6 > > > > That's stupid. Someone publishing _my_ tree, which I make no guarantees > > about the life of the commits, for other people to base their work on... > > That's definitely a big FAIL. > > > > Luckily for you though, that commit still exists in my tree, and I've > > asked Linus to pull that set; so essentially it became immutable only > > last night. > > > > Don't base patches on the contents of my tree without talking to me first > > please. > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-08-24 14:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-16 13:45 Pull request for OMAP PM, clock, SDRC 2.6.32 patches Paul Walmsley
2009-08-17 17:09 ` Russell King - ARM Linux
[not found] ` <20090817170921.GT10764-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2009-08-18 12:35 ` Paul Walmsley
[not found] ` <alpine.DEB.2.00.0908180621270.7224-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>
2009-08-18 23:04 ` Woodruff, Richard
[not found] ` <13B9B4C6EF24D648824FF11BE89671620399F63372-EovWT4A8QTWIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2009-08-18 23:27 ` Paul Walmsley
[not found] ` <alpine.DEB.2.00.0908181720460.23762-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>
2009-08-19 0:15 ` Woodruff, Richard
2009-08-24 14:29 ` Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox