From 3ddd27793bda5d7e0cb6d808c185bc0eea12542e Mon Sep 17 00:00:00 2001 From: Jouni Hogander Date: Mon, 12 Oct 2009 13:24:46 +0300 Subject: [PATCH] OMAP3: Convert OMAP2_IO_ADDRESS to OMAP2_L3|L4_IO_ADDRESS OMAP2_IO_ADDRESS is split into OMAP2_L3|L4_IO_ADDRESS. Fix usage off old macros in pmgmt code. Signed-off-by: Jouni Hogander --- arch/arm/mach-omap2/board-rx51-sdram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/board-rx51-sdram.c b/arch/arm/mach-omap2/board-rx51-sdram.c index b7cc859d400..5e1790afe78 100644 --- a/arch/arm/mach-omap2/board-rx51-sdram.c +++ b/arch/arm/mach-omap2/board-rx51-sdram.c @@ -79,7 +79,7 @@ static u32 cm_base = CM_BASE; static inline u32 cm_read_reg(int idx) { - return *(u32 *)OMAP2_IO_ADDRESS(cm_base + idx); + return *(u32 *)OMAP2_L4_IO_ADDRESS(cm_base + idx); } static const unsigned long sys_clk_rate_table[] = { @@ -90,8 +90,8 @@ static unsigned long get_sys_clk_rate(void) { unsigned long rate; - rate = sys_clk_rate_table[*(u32 *)OMAP2_IO_ADDRESS(PRM_CLKSEL) & 0x07]; - if (((*(u32 *)OMAP2_IO_ADDRESS(PRM_CLKSRC_CTRL) >> 6) & 0x03) == 0x02) + rate = sys_clk_rate_table[*(u32 *)OMAP2_L4_IO_ADDRESS(PRM_CLKSEL) & 0x07]; + if (((*(u32 *)OMAP2_L4_IO_ADDRESS(PRM_CLKSRC_CTRL) >> 6) & 0x03) == 0x02) rate /= 2; return rate; } -- 2.11.4.GIT