Patchwork [GIT,PULL] ARM: OMAP: clock, powerdomain, clockdomain, hwmod fixes for early v3.4-rc

login
register
mail settings
Submitter Paul Walmsley
Date April 4, 2012, 11 p.m.
Message ID <alpine.DEB.2.00.1204041658200.7161@utopia.booyaka.com>
Download mbox
Permalink /patch/150820/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending tags/omap-fixes-a-for-3.4rc

Comments

Paul Walmsley - April 4, 2012, 11 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Tony,

The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:

  Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending tags/omap-fixes-a-for-3.4rc

for you to fetch changes up to cf1a9298231d7719b67ad0eae6236c91888b7a32:

  Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_3.4rc', 'powerdomain_fixes_a_3.4rc' and 'prcm_fixes_3.4rc' into fixes_for_3.4rc2 (2012-04-04 14:53:33 -0600)

These changes have been boot-tested on OMAP37xx ES1.0 Beagleboard-XM,
OMAP2420 N800, OMAP4430 ES2.0 Pandaboard, and OMAP35xx ES3.0
BeagleBoard.  System suspend and serial wakeup has been tested
on OMAP4430 ES2.0 Pandaboard, and dynamic retention idle and serial
wakeup has been tested on OMAP35xx ES3.0 BeagleBoard.

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

OMAP clock, powerdomain, clockdomain, hwmod, and PRCM fixes
intended for the early v3.4-rc series.  Also contains an
HSMMC integration refinement of an earlier hardware bug
workaround.

ARM: OMAP3: clock data: fill in some missing clockdomains
ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock
ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL
ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()
ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK
ARM: OMAP4: prm: fix interrupt register offsets
ARM: OMAP AM3517/3505: clock data: change EMAC clocks aliases
ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions
ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
ARM: OMAP2+: hwmod: Restore sysc after a reset
ARM: OMAP: clock: fix race in disable all clocks
ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks
ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules
ARM: OMAP3xxx: clock data: fix DPLL4 CLKSEL masks
ARM: OMAP3xxx: HSMMC: avoid erratum workaround when transceiver is attached
ARM: OMAP44xx: clockdomain data: correct the emu_sys_clkdm CLKTRCTRL data

- ----------------------------------------------------------------
Ameya Palande (1):
      ARM: OMAP4: clock data: fix mult and div mask for USB_DPLL

Govindraj.R (1):
      ARM: OMAP2+: omap_hwmod: Allow io_ring wakeup configuration for all modules

Grazvydas Ignotas (2):
      ARM: OMAP3xxx: HSMMC: avoid erratum workaround when transceiver is attached
      ARM: OMAP3xxx: clock data: fix DPLL4 CLKSEL masks

Ilya Yanok (1):
      ARM: OMAP AM3517/3505: clock data: change EMAC clocks aliases

Nishanth Menon (1):
      ARM: OMAP: clock: fix race in disable all clocks

Paul Walmsley (4):
      ARM: OMAP44xx: clockdomain data: correct the emu_sys_clkdm CLKTRCTRL data
      ARM: OMAP4: hwmod data: Add aliases for McBSP fclk clocks
      ARM: OMAP3: clock data: fill in some missing clockdomains
      Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_3.4rc', 'powerdomain_fixes_a_3.4rc' and 'prcm_fixes_3.4rc' into fixes_for_3.4rc2

Rajendra Nayak (4):
      ARM: OMAP2+: hwmod: Restore sysc after a reset
      ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status
      ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK
      ARM: OMAP4: clock data: Force a DPLL clkdm/pwrdm ON before a relock

Santosh Shilimkar (1):
      ARM: OMAP2+: powerdomain: Wait for powerdomain transition in pwrdm_state_switch()

Tero Kristo (1):
      ARM: OMAP4: prm: fix interrupt register offsets

Vaibhav Hiremath (1):
      ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions

 arch/arm/mach-omap2/clock3xxx_data.c         |   18 +++--
 arch/arm/mach-omap2/clock44xx_data.c         |    5 +-
 arch/arm/mach-omap2/clockdomains44xx_data.c  |    2 +-
 arch/arm/mach-omap2/hsmmc.c                  |    7 ++
 arch/arm/mach-omap2/omap_hwmod.c             |   96 ++++++++++++--------------
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c   |   28 ++++++++
 arch/arm/mach-omap2/powerdomain.c            |    8 ++-
 arch/arm/mach-omap2/prm44xx.c                |   21 +++---
 arch/arm/plat-omap/clock.c                   |    5 +-
 arch/arm/plat-omap/include/plat/omap_hwmod.h |   12 ++--
 10 files changed, 121 insertions(+), 81 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBAgAGBQJPfM6EAAoJEMePsQ0LvSpLMAwQAK36qu6QVz1CwXszh+xxhK+e
+d9MlU2A5WHNBwZeP8L8uW91HO1MsD4m3/PF0G1j6ck1Ul6y9RhVihNlThAPLQ9T
qELhQwzq3PEcTrjDbR9ch9uL4tBMKmHyxTpzLj9mEhrBlwZu3zi8su5631UIlHwj
ki9OEEOrDCdFgZqjPiyYmKFuxAFo29oWlHdiGXTWPIQLNjYJTc1uApCh8l7bskx9
4cAHfOZabktrUR50OVrVH2ZCe1vbhOMKhf/dS5TXOjUcJErbwUKChBWdRdMgGpd/
812WCkXY0gQETLud72tLeGjoR9TmAbbJHFa6cSml3kfHgYHOkGMEP//sq0zsmZ4y
06RcRxczgrwOrfzNDnGffv3che6YxTS2cAyoVSXMcLQ3DgQbaTfc+j4HhcthFp7C
QnGLTzkEvytOk0uP6ZP0Z7dhU6a7Kd+oPVx/Q7cFyBL927yO/2FpefGPed22uTzx
2BvcYthz+vNZU86tFCa+KXjoy3+SOaeSmJa3rJD+Q704wG7nZUT9q/0O9lxARvNf
EBKnInGq9B9KPYh7xHZIscLmyIJsAmTdyairtPeMv9Uyw+qGR4yssW2Rs7u3EdiA
qYxkaFtLBF4VGTtUgptylHgOhEw/NB54XOurENt89fmFKGghIHLIaJTZ3V2O/k7+
gu49aqNRCPgStrD2g+We
=EaFF
-----END PGP SIGNATURE-----
Tony Lindgren - April 5, 2012, 12:41 a.m.
* Paul Walmsley <paul@pwsan.com> [120404 16:03]:
> Hi Tony,
> 
> The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
> 
>   Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending tags/omap-fixes-a-for-3.4rc
> 
> for you to fetch changes up to cf1a9298231d7719b67ad0eae6236c91888b7a32:
> 
>   Merge branches 'clock_fixes_3.4rc', 'clockdomain_fixes_3.4rc', 'hsmmc_erratum_2_1_1_128_refine_3.4rc1', 'hwmod_data_fixes_a_3.4rc', 'hwmod_fixes_3.4rc', 'powerdomain_fixes_a_3.4rc' and 'prcm_fixes_3.4rc' into fixes_for_3.4rc2 (2012-04-04 14:53:33 -0600)
> 
> These changes have been boot-tested on OMAP37xx ES1.0 Beagleboard-XM,
> OMAP2420 N800, OMAP4430 ES2.0 Pandaboard, and OMAP35xx ES3.0
> BeagleBoard.  System suspend and serial wakeup has been tested
> on OMAP4430 ES2.0 Pandaboard, and dynamic retention idle and serial
> wakeup has been tested on OMAP35xx ES3.0 BeagleBoard.

Thanks, looks like two of these patches I already merged into
fixes yesterday from your earlier pull request. So merging this
in would cause duplicate commits. Can you please update your
branch to remove those two commits?

Meanwhile, I've merged your branch into linux-omap master branch
for some more testing while waiting for the update.

Regards,

Tony
Paul Walmsley - April 5, 2012, 2:07 a.m.
On Wed, 4 Apr 2012, Tony Lindgren wrote:

> Thanks, looks like two of these patches I already merged into
> fixes yesterday from your earlier pull request. So merging this
> in would cause duplicate commits. Can you please update your
> branch to remove those two commits?

Do you happen to recall which ones they are?


- Paul
Paul Walmsley - April 5, 2012, 8:50 a.m.
On Wed, 4 Apr 2012, Paul Walmsley wrote:

> On Wed, 4 Apr 2012, Tony Lindgren wrote:
> 
> > Thanks, looks like two of these patches I already merged into
> > fixes yesterday from your earlier pull request. So merging this
> > in would cause duplicate commits. Can you please update your
> > branch to remove those two commits?
> 
> Do you happen to recall which ones they are?

Anyway, am guessing that you are planning to pull these into your 
'fixes' branch?  If so then probably the conflicts are with the 
misc_devel_3.4 branch patches.  Will post another pull request for you 
with those two patches dropped.  But if you're pulling these into a 
different branch, please let me know...


- Paul
Tony Lindgren - April 5, 2012, 4:42 p.m.
* Paul Walmsley <paul@pwsan.com> [120405 01:53]:
> On Wed, 4 Apr 2012, Paul Walmsley wrote:
> 
> > On Wed, 4 Apr 2012, Tony Lindgren wrote:
> > 
> > > Thanks, looks like two of these patches I already merged into
> > > fixes yesterday from your earlier pull request. So merging this
> > > in would cause duplicate commits. Can you please update your
> > > branch to remove those two commits?
> > 
> > Do you happen to recall which ones they are?
> 
> Anyway, am guessing that you are planning to pull these into your 
> 'fixes' branch?  If so then probably the conflicts are with the 
> misc_devel_3.4 branch patches.  Will post another pull request for you 
> with those two patches dropped.  But if you're pulling these into a 
> different branch, please let me know...

Yes it's the fixes branch I was talking about, thanks for updating it.

Tony
Paul Walmsley - April 5, 2012, 7:50 p.m.
On Thu, 5 Apr 2012, Tony Lindgren wrote:

> Yes it's the fixes branch I was talking about, thanks for updating it.

Thanks -- sorry about the confusion...


- Paul