mbox

[GIT,PULL] OMAP: clock/powerdomain/clockdomain/hwmod: fixes for 3.1-rc

Message ID alpine.DEB.2.00.1108222319310.28226@utopia.booyaka.com
State New
Headers show

Pull-request

git://git.pwsan.com/linux-2.6 prcm-fixes-a-3.1rc

Message

Paul Walmsley Aug. 23, 2011, 5:35 a.m. UTC
Hi Tony,

The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:

  Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)

are available in the git repository at:
  git://git.pwsan.com/linux-2.6 prcm-fixes-a-3.1rc

Note that for these changes to boot successfully on 3.1-rc3, the following 
patch is needed:

  http://marc.info/?l=linux-omap&m=131407622527432&w=2

The changes have been boot-tested on N800, OMAP3530 Beagle, and 
OMAP4430ES2 Panda.  They've also passed compile tests with a few different 
configs here.

Paul Walmsley (4):
      OMAP4: clock: re-enable previous clockdomain enable/disable sequence
      OMAP4: clock: fix compile warning
      OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
      Merge branches 'pwrdm_clkdm_fixes_3.1rc', 'omap2_3_hwmod_dss_fixes_3.1rc', 'non_hwmod_compliant_fix_3.1rc', 'omap4_clock_fixes_3.1rc' and 'omap3_clock_fixes_3.1rc' into prcm-fixes-a-3.1rc

Rajendra Nayak (1):
      OMAP: powerdomains: Make all powerdomain target states as ON at init

Santosh Shilimkar (1):
      OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup

Tomi Valkeinen (5):
      OMAP2xxx: HWMOD: fix DSS opt clocks
      OMAP3: HWMOD: fix DSS opt clocks
      OMAP4: HWMOD: fix DSS opt clocks
      OMAP2/3: HWMOD: Add SYSS_HAS_RESET_STATUS for dss
      OMAP: HWMOD: Unify DSS resets for all OMAPs

 arch/arm/mach-omap2/Makefile                       |    5 +--
 arch/arm/mach-omap2/clock3xxx_data.c               |    2 +
 arch/arm/mach-omap2/clock44xx_data.c               |   10 +++++-
 arch/arm/mach-omap2/clockdomain.c                  |    2 +
 arch/arm/mach-omap2/display.c                      |   35 ++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   15 +++++++-
 arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   15 +++++++-
 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    5 ++-
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   35 +++++++++++++++++--
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   19 ++++-------
 arch/arm/mach-omap2/pm.c                           |    2 -
 arch/arm/mach-omap2/powerdomain.c                  |   25 +++++++++-----
 arch/arm/plat-omap/include/plat/common.h           |    3 ++
 include/video/omapdss.h                            |    7 ----
 14 files changed, 136 insertions(+), 44 deletions(-)

Comments

Paul Walmsley Aug. 30, 2011, 7:06 a.m. UTC | #1
Hi Tony,

On Tue, 23 Aug 2011, Paul Walmsley wrote:

> The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
> 
>   Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)
> 
> are available in the git repository at:
>   git://git.pwsan.com/linux-2.6 prcm-fixes-a-3.1rc

Just checking up on this.  Any issues with this branch?

> I've dropped Tomi's patches until the changelogs for those are fixed.

Tomi's patches have been queued for 3.2, by the way.

> Note that for these changes to boot successfully on 3.1-rc3, the following 
> patch is needed:
> 
>   http://marc.info/?l=linux-omap&m=131407622527432&w=2

And Linus has resolved this problem for 3.1-rc4 with commit 
69dd3d8e29e294caaf63eb5e8a72d250279f9e5f ("Revert "irq: Always set 
IRQF_ONESHOT if no primary handler is specified"").

> 
> Paul Walmsley (4):
>       OMAP4: clock: re-enable previous clockdomain enable/disable sequence
>       OMAP4: clock: fix compile warning
>       OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
>       Merge branches 'pwrdm_clkdm_fixes_3.1rc', 'non_hwmod_compliant_fix_3.1rc', 'omap4_clock_fixes_3.1rc' and 'omap3_clock_fixes_3.1rc' into prcm-fixes-a-3.1rc
> 
> Rajendra Nayak (1):
>       OMAP: powerdomains: Make all powerdomain target states as ON at init
> 
> Santosh Shilimkar (1):
>       OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
> 
>  arch/arm/mach-omap2/clock3xxx_data.c |    2 ++
>  arch/arm/mach-omap2/clock44xx_data.c |   10 +++++++++-
>  arch/arm/mach-omap2/clockdomain.c    |    2 ++
>  arch/arm/mach-omap2/pm.c             |    2 --
>  arch/arm/mach-omap2/powerdomain.c    |   25 ++++++++++++++++---------
>  5 files changed, 29 insertions(+), 12 deletions(-)
> 


- Paul
Paul Walmsley Sept. 1, 2011, 11:52 p.m. UTC | #2
On Tue, 30 Aug 2011, Paul Walmsley wrote:

> On Tue, 23 Aug 2011, Paul Walmsley wrote:
> 
> > The following changes since commit fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c:
> > 
> >   Linux 3.1-rc3 (2011-08-22 11:42:53 -0700)
> > 
> > are available in the git repository at:
> >   git://git.pwsan.com/linux-2.6 prcm-fixes-a-3.1rc
> 
> Just checking up on this.  Any issues with this branch?

By the way, this branch has now been updated to base on v3.1-rc4.


- Paul
Tony Lindgren Sept. 6, 2011, 11:29 a.m. UTC | #3
Arnd,

Care to pull the following fixes to the -rc series from Paul?


* Paul Walmsley <paul@pwsan.com> [110904 18:53]:
> The following changes since commit c6a389f123b9f68d605bb7e0f9b32ec1e3e14132:
> 
>   Linux 3.1-rc4 (2011-08-28 21:16:01 -0700)
> 
> are available in the git repository at:
>   git://git.pwsan.com/linux-2.6 prcm-fixes-a-3.1rc
> 
> This update adds a patch for a missing array terminator in the OMAP2430 
> hwmod data.
> 
> Paul Walmsley (5):
>       OMAP4: clock: re-enable previous clockdomain enable/disable sequence
>       OMAP4: clock: fix compile warning
>       OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
>       OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
>       Merge branches 'non_hwmod_compliant_fix_3.1rc', 'omap3_clock_fixes_3.1rc', 'omap4_clock_fixes_3.1rc', 'missing_2430_musb_adds_terminator_fix_3.1rc' and 'pwrdm_clkdm_fixes_3.1rc' into prcm-fixes-a-3.1rc
> 
> Rajendra Nayak (1):
>       OMAP: powerdomains: Make all powerdomain target states as ON at init
> 
> Santosh Shilimkar (1):
>       OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
> 
>  arch/arm/mach-omap2/clock3xxx_data.c       |    2 ++
>  arch/arm/mach-omap2/clock44xx_data.c       |   10 +++++++++-
>  arch/arm/mach-omap2/clockdomain.c          |    2 ++
>  arch/arm/mach-omap2/omap_hwmod_2430_data.c |    1 +
>  arch/arm/mach-omap2/pm.c                   |    2 --
>  arch/arm/mach-omap2/powerdomain.c          |   25 ++++++++++++++++---------
>  6 files changed, 30 insertions(+), 12 deletions(-)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Russell King - ARM Linux Sept. 6, 2011, 11:45 a.m. UTC | #4
On Tue, Sep 06, 2011 at 04:29:14AM -0700, Tony Lindgren wrote:
> Arnd,
> 
> Care to pull the following fixes to the -rc series from Paul?

Tony,

I don't think that will happen until master.kernel.org is back online
as the tree was hosted on that machine.
Arnd Bergmann Sept. 8, 2011, 3:17 p.m. UTC | #5
On Tuesday 06 September 2011, Russell King - ARM Linux wrote:
> On Tue, Sep 06, 2011 at 04:29:14AM -0700, Tony Lindgren wrote:
> > Arnd,
> > 
> > Care to pull the following fixes to the -rc series from Paul?
> 
> Tony,
> 
> I don't think that will happen until master.kernel.org is back online
> as the tree was hosted on that machine.

Right. I have a number of pull requests lined up. While I did consider
starting a new tree on git.linaro.org to handle the time until then,
I'm still hoping for hera to get back online at some point, and linux-next
is equally disabled for now.

Please remind me about any pull requests that I may have forgotten once
hera is back.

	Arnd
Nicolas Pitre Sept. 8, 2011, 5:49 p.m. UTC | #6
On Thu, 8 Sep 2011, Arnd Bergmann wrote:

> On Tuesday 06 September 2011, Russell King - ARM Linux wrote:
> > On Tue, Sep 06, 2011 at 04:29:14AM -0700, Tony Lindgren wrote:
> > > Arnd,
> > > 
> > > Care to pull the following fixes to the -rc series from Paul?
> > 
> > Tony,
> > 
> > I don't think that will happen until master.kernel.org is back online
> > as the tree was hosted on that machine.
> 
> Right. I have a number of pull requests lined up. While I did consider
> starting a new tree on git.linaro.org to handle the time until then,
> I'm still hoping for hera to get back online at some point, and linux-next
> is equally disabled for now.

I think that putting the tree on git.linaro.org would be a good thing to 
do as an intermediate measure.


Nicolas
Arnd Bergmann Sept. 10, 2011, 9:16 p.m. UTC | #7
On Thursday 08 September 2011, Nicolas Pitre wrote:
> On Thu, 8 Sep 2011, Arnd Bergmann wrote:
> 
> > On Tuesday 06 September 2011, Russell King - ARM Linux wrote:
> > > On Tue, Sep 06, 2011 at 04:29:14AM -0700, Tony Lindgren wrote:
> > > > Arnd,
> > > > 
> > > > Care to pull the following fixes to the -rc series from Paul?
> > > 
> > > Tony,
> > > 
> > > I don't think that will happen until master.kernel.org is back online
> > > as the tree was hosted on that machine.
> > 
> > Right. I have a number of pull requests lined up. While I did consider
> > starting a new tree on git.linaro.org to handle the time until then,
> > I'm still hoping for hera to get back online at some point, and linux-next
> > is equally disabled for now.
> 
> I think that putting the tree on git.linaro.org would be a good thing to 
> do as an intermediate measure.

Ok, pulled into the fixes branch.

Thanks everyone,

	Arnd