summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/sdrc2xxx.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-05-25 20:26:42 +0200
committerTony Lindgren <tony@atomide.com>2009-05-25 20:26:42 +0200
commit8e3bd351d1d2505e17d0b10c17bf8d7655eb9faf (patch)
treec1efd26ff3761d7f83984f51fd68e13cd686b1e5 /arch/arm/mach-omap2/sdrc2xxx.c
parentARM: OMAP2/3: Remove OMAP2_32KSYNCT_BASE (diff)
downloadlinux-8e3bd351d1d2505e17d0b10c17bf8d7655eb9faf.tar.xz
linux-8e3bd351d1d2505e17d0b10c17bf8d7655eb9faf.zip
ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE
Remove OMAP_PRM_REGADDR and use processor specific defines instead. Also fold in a patch from Kevin Hilman to add _OFFSET #defines for the PRCM registers to be used with the prm_[read|write]_* macros. These are used extensively in the forthcoming OMAP PM support. Also remove now unused OMAP2_PRM_BASE. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/sdrc2xxx.c')
-rw-r--r--arch/arm/mach-omap2/sdrc2xxx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c
index 0afdad5ae9fb..feaec7eaf6bd 100644
--- a/arch/arm/mach-omap2/sdrc2xxx.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@@ -99,7 +99,10 @@ u32 omap2xxx_sdrc_reprogram(u32 level, u32 force)
m_type = omap2xxx_sdrc_get_type();
local_irq_save(flags);
- __raw_writel(0xffff, OMAP24XX_PRCM_VOLTSETUP);
+ if (cpu_is_omap2420())
+ __raw_writel(0xffff, OMAP2420_PRCM_VOLTSETUP);
+ else
+ __raw_writel(0xffff, OMAP2430_PRCM_VOLTSETUP);
omap2_sram_reprogram_sdrc(level, dll_ctrl, m_type);
curr_perf_level = level;
local_irq_restore(flags);