[PATCH 13/18] omap2: convert sram-fn.S to use {PRM, CM}_BASE rather than PRCM_BASE

Paul Walmsley
2007-05-17T00:11:45Z

[-- Attachment #1: 0013-omap2-convert-sram-fn.S-to-use-PRM-CM-_BASE-rather.patch --]
[-- Type: text/plain, Size: 1378 bytes --]

Use PRM_BASE and CM_BASE in sram-fn.s to prepare for the OMAP3430
conversion.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/sram-fn.S | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S
index 3fe3a34..297b00e 100644
--- a/arch/arm/mach-omap2/sram-fn.S
+++ b/arch/arm/mach-omap2/sram-fn.S
@@ -27,16 +27,14 @@
#include <asm/arch/io.h>
#include <asm/hardware.h>

-#include "prcm-regs.h"
-
#define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP_32KSYNCT_BASE + 0x010)

-#define CM_CLKSEL2_PLL_V IO_ADDRESS(PRCM_BASE + 0x544)
-#define PRCM_VOLTCTRL_V IO_ADDRESS(PRCM_BASE + 0x050)
-#define PRCM_CLKCFG_CTRL_V IO_ADDRESS(PRCM_BASE + 0x080)
-#define CM_CLKEN_PLL_V IO_ADDRESS(PRCM_BASE + 0x500)
-#define CM_IDLEST_CKGEN_V IO_ADDRESS(PRCM_BASE + 0x520)
-#define CM_CLKSEL1_PLL_V IO_ADDRESS(PRCM_BASE + 0x540)
+#define CM_CLKSEL2_PLL_V IO_ADDRESS(CM_BASE + 0x544)
+#define PRCM_VOLTCTRL_V IO_ADDRESS(PRM_BASE + 0x050)
+#define PRCM_CLKCFG_CTRL_V IO_ADDRESS(PRM_BASE + 0x080)
+#define CM_CLKEN_PLL_V IO_ADDRESS(CM_BASE + 0x500)
+#define CM_IDLEST_CKGEN_V IO_ADDRESS(CM_BASE + 0x520)
+#define CM_CLKSEL1_PLL_V IO_ADDRESS(CM_BASE + 0x540)

#define SDRC_DLLA_CTRL_V IO_ADDRESS(SDRC_BASE + 0x060)
#define SDRC_RFR_CTRL_V IO_ADDRESS(SDRC_BASE + 0x0a4)
--
1.5.1.3

--