Patchwork [GIT,PULL] OMAP: PM support for OMAP4 MPU sub-system

login
register
mail settings
Submitter Kevin Hilman
Date Dec. 8, 2011, 6:45 p.m.
Message ID <874nxaewbv.fsf@ti.com>
Download mbox
Permalink /patch/130211/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.3/pm/omap4-mpuss

Comments

Kevin Hilman - Dec. 8, 2011, 6:45 p.m.
Tony,

Please pull the OMAP4 MPUSS PM series below.  It is based on the
Russell's devel-stable branch due to dependencies

Kevin

The following changes since commit 3ee0fc5ca129cbae81c073756febcb1c552af446:

  Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable (2011-12-06 20:27:54 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.3/pm/omap4-mpuss

Santosh Shilimkar (24):
      ARM: OMAP4: Use WARN_ON() instead of BUG_ON() with graceful exit
      ARM: OMAP4: Export omap4_get_base*() rather than global address pointers
      ARM: OMAP4: PM: Add SAR RAM support
      ARM: OMAP4: PM: Keep static dep between MPUSS-EMIF and MPUSS-L3/L4 and DUCATI-L3
      ARM: OMAP4: PM: Avoid omap4_pm_init() on OMAP4430 ES1.0
      ARM: OMAP4: PM: Initialise all the clockdomains to supported states
      ARM: OMAP: Add Secure HAL and monitor mode API infrastructure.
      ARM: OMAP: PM: Add support to allocate the memory for secure RAM
      ARM: OMAP4: PM: Add WakeupGen module as OMAP gic_arch_extn
      ARM: OMAP4: PM: Add CPUX OFF mode support
      ARM: OMAP4: Remove __INIT from omap_secondary_startup() to re-use it for hotplug.
      ARM: OMAP4: PM: Program CPU1 to hit OFF when off-lined
      ARM: OMAP4: PM: CPU1 wakeup workaround from Low power modes
      ARM: OMAP4: PM: Use custom omap_do_wfi() for default idle.
      ARM: OMAP4: suspend: Add MPUSS power domain RETENTION support
      ARM: OMAP4: Remove un-used do_wfi() macro.
      ARM: OMAP4: PM: Add WakeupGen and secure GIC low power support
      ARM: OMAP4: PM: Add L2X0 cache lowpower support
      ARM: OMAP4: PM: Add MPUSS power domain OSWR support
      ARM: OMAP4: PM: Add power domain statistics support
      ARM: OMAP4: Fix errata i688 with MPU interconnect barriers.
      ARM: OMAP4: PM: Add CPUidle support
      ARM: OMAP4: cpuidle: Switch to gptimer from twd in deeper C-states.
      ARM: OMAP3: CPUidle: Make use of CPU PM notifiers

 arch/arm/mach-omap2/Kconfig                        |   21 +
 arch/arm/mach-omap2/Makefile                       |   16 +-
 arch/arm/mach-omap2/common.h                       |   64 +++-
 arch/arm/mach-omap2/cpuidle34xx.c                  |   15 +
 arch/arm/mach-omap2/cpuidle44xx.c                  |  245 ++++++++++++
 arch/arm/mach-omap2/include/mach/barriers.h        |   31 ++
 arch/arm/mach-omap2/include/mach/omap-secure.h     |   57 +++
 arch/arm/mach-omap2/include/mach/omap-wakeupgen.h  |   39 ++
 arch/arm/mach-omap2/io.c                           |    9 +
 arch/arm/mach-omap2/omap-headsmp.S                 |    5 -
 arch/arm/mach-omap2/omap-hotplug.c                 |   14 +-
 arch/arm/mach-omap2/omap-mpuss-lowpower.c          |  398 ++++++++++++++++++++
 arch/arm/mach-omap2/omap-secure.c                  |   81 ++++
 arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} |   23 ++
 arch/arm/mach-omap2/omap-smp.c                     |   45 +++
 arch/arm/mach-omap2/omap-wakeupgen.c               |  389 +++++++++++++++++++
 arch/arm/mach-omap2/omap4-common.c                 |   94 +++++-
 arch/arm/mach-omap2/omap4-sar-layout.h             |   50 +++
 arch/arm/mach-omap2/pm.h                           |    1 +
 arch/arm/mach-omap2/pm44xx.c                       |  153 ++++++++-
 arch/arm/mach-omap2/sleep44xx.S                    |  379 +++++++++++++++++++
 arch/arm/plat-omap/common.c                        |    3 +
 arch/arm/plat-omap/include/plat/omap-secure.h      |   13 +
 arch/arm/plat-omap/include/plat/omap44xx.h         |    1 +
 arch/arm/plat-omap/include/plat/sram.h             |    6 +-
 arch/arm/plat-omap/sram.c                          |    8 +
 26 files changed, 2126 insertions(+), 34 deletions(-)
 create mode 100644 arch/arm/mach-omap2/cpuidle44xx.c
 create mode 100644 arch/arm/mach-omap2/include/mach/barriers.h
 create mode 100644 arch/arm/mach-omap2/include/mach/omap-secure.h
 create mode 100644 arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
 create mode 100644 arch/arm/mach-omap2/omap-mpuss-lowpower.c
 create mode 100644 arch/arm/mach-omap2/omap-secure.c
 rename arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} (70%)
 create mode 100644 arch/arm/mach-omap2/omap-wakeupgen.c
 create mode 100644 arch/arm/mach-omap2/omap4-sar-layout.h
 create mode 100644 arch/arm/mach-omap2/sleep44xx.S
 create mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
Tony Lindgren - Dec. 8, 2011, 7:19 p.m.
* Kevin Hilman <khilman@ti.com> [111208 10:14]:
> Tony,
> 
> Please pull the OMAP4 MPUSS PM series below.  It is based on the
> Russell's devel-stable branch due to dependencies
> 
> Kevin
> 
> The following changes since commit 3ee0fc5ca129cbae81c073756febcb1c552af446:
> 
>   Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable (2011-12-06 20:27:54 +0000)

I don't think there's a dependency here to the kexec/idmap commit?

Great yeah this is badly needed. One minor thing, can you please rebase
this on one commit earlier to commit deee6d5359969a0ce4e2760cfd7b9f379bd5698a
(ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM
restart changes) as that's what we have as the base for other branches.

It sounds like we'll have to base board branch to something later in
devel-stable for the machine_id, but from generating pull requests point
of view it's best to have the same base for other branches unless
there are new dependencies involved.

Regards,

Tony
Kevin Hilman - Dec. 8, 2011, 7:45 p.m.
Tony Lindgren <tony@atomide.com> writes:

> * Kevin Hilman <khilman@ti.com> [111208 10:14]:
>> Tony,
>> 
>> Please pull the OMAP4 MPUSS PM series below.  It is based on the
>> Russell's devel-stable branch due to dependencies
>> 
>> Kevin
>> 
>> The following changes since commit 3ee0fc5ca129cbae81c073756febcb1c552af446:
>> 
>>   Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable (2011-12-06 20:27:54 +0000)
>
> I don't think there's a dependency here to the kexec/idmap commit?

Nope.

> Great yeah this is badly needed. One minor thing, can you please rebase
> this on one commit earlier to commit deee6d5359969a0ce4e2760cfd7b9f379bd5698a
> (ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM
> restart changes) as that's what we have as the base for other branches.

Done, pushed updated branch.

Kevin
Tony Lindgren - Dec. 8, 2011, 9:29 p.m.
* Kevin Hilman <khilman@ti.com> [111208 11:13]:
> Tony Lindgren <tony@atomide.com> writes:
> 
> > * Kevin Hilman <khilman@ti.com> [111208 10:14]:
> >> Tony,
> >> 
> >> Please pull the OMAP4 MPUSS PM series below.  It is based on the
> >> Russell's devel-stable branch due to dependencies
> >> 
> >> Kevin
> >> 
> >> The following changes since commit 3ee0fc5ca129cbae81c073756febcb1c552af446:
> >> 
> >>   Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable (2011-12-06 20:27:54 +0000)
> >
> > I don't think there's a dependency here to the kexec/idmap commit?
> 
> Nope.
> 
> > Great yeah this is badly needed. One minor thing, can you please rebase
> > this on one commit earlier to commit deee6d5359969a0ce4e2760cfd7b9f379bd5698a
> > (ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM
> > restart changes) as that's what we have as the base for other branches.
> 
> Done, pushed updated branch.

Thanks a lot, pulled into omap4 branch and pushed out.

Regards,

Tony