From: Paul Walmsley Date: Thu, 3 May 2007 22:52:56 +0000 (-0600) Subject: omap2: convert sram-fn.S to use OMAP2_{PRM,CM}_BASE rather than OMAP2_PRCM_BASE X-Git-Tag: v2.6.22-omap1~90 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1bd7f8f6d63ca90fa0c2897cd51f6e20dcff9d75;p=linux-2.6-omap-h63xx.git omap2: convert sram-fn.S to use OMAP2_{PRM,CM}_BASE rather than OMAP2_PRCM_BASE Use OMAP2_PRM_BASE and OMAP2_CM_BASE in sram-fn.s to prepare for the OMAP3430 conversion. Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S index b0e8952b8df..95146452fd9 100644 --- a/arch/arm/mach-omap2/sram-fn.S +++ b/arch/arm/mach-omap2/sram-fn.S @@ -27,16 +27,14 @@ #include #include -#include "prcm-regs.h" - #define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) -#define CM_CLKSEL2_PLL_V IO_ADDRESS(OMAP2_PRCM_BASE + 0x544) -#define PRCM_VOLTCTRL_V IO_ADDRESS(OMAP2_PRCM_BASE + 0x050) -#define PRCM_CLKCFG_CTRL_V IO_ADDRESS(OMAP2_PRCM_BASE + 0x080) -#define CM_CLKEN_PLL_V IO_ADDRESS(OMAP2_PRCM_BASE + 0x500) -#define CM_IDLEST_CKGEN_V IO_ADDRESS(OMAP2_PRCM_BASE + 0x520) -#define CM_CLKSEL1_PLL_V IO_ADDRESS(OMAP2_PRCM_BASE + 0x540) +#define CM_CLKSEL2_PLL_V IO_ADDRESS(OMAP2_CM_BASE + 0x544) +#define PRCM_VOLTCTRL_V IO_ADDRESS(OMAP2_PRM_BASE + 0x050) +#define PRCM_CLKCFG_CTRL_V IO_ADDRESS(OMAP2_PRM_BASE + 0x080) +#define CM_CLKEN_PLL_V IO_ADDRESS(OMAP2_CM_BASE + 0x500) +#define CM_IDLEST_CKGEN_V IO_ADDRESS(OMAP2_CM_BASE + 0x520) +#define CM_CLKSEL1_PLL_V IO_ADDRESS(OMAP2_CM_BASE + 0x540) #define SDRC_DLLA_CTRL_V IO_ADDRESS(OMAP2_SDRC_BASE + 0x060) #define SDRC_RFR_CTRL_V IO_ADDRESS(OMAP2_SDRC_BASE + 0x0a4)