diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-08 11:49:09 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-08 11:49:09 -0700 |
| commit | 743a6d923f803c861a24d173e1d1818ca8ac0384 (patch) | |
| tree | 29a1c1e8a6a45f7b9319de9155d5346603ee202b /arch/arm/mach-omap2/common.c | |
| parent | 1df82cd6d7673006ae2ecbe8745bcf44f61c53a8 (diff) | |
| parent | 0135f6a04642c192bdf4b36e06937d3387e174ff (diff) | |
| download | olio-linux-3.10-743a6d923f803c861a24d173e1d1818ca8ac0384.tar.xz olio-linux-3.10-743a6d923f803c861a24d173e1d1818ca8ac0384.zip | |
Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-prcm
Some OMAP PRCM updates for 3.5. Includes some clock, clockdomain,
powerdomain, PRM, and CM changes.
Diffstat (limited to 'arch/arm/mach-omap2/common.c')
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 1549c11000d..8a6953a34fe 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -166,6 +166,7 @@ static struct omap_globals omap4_globals = { .prm = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE), .cm = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE), .cm2 = OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE), + .prcm_mpu = OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE), }; void __init omap2_set_globals_443x(void) |