dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ARM: OMAP4: PM: Fix the PRM and CM base addresses 

This patch fixes the PRM and CM base addresses and adds
a new CM2 base address for OMAP4

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
This commit is contained in:
Rajendra Nayak 2009-12-08 18:24:49 -07:00 committed by paul
parent 0d93d8bb7f
commit 9ef89150ea
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/Makefile
View File

@ -11,6 +11,7 @@ clock-common = clock.o clock_common_data.o clockdomain.o
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common) obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common)
obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common) obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common)
obj-$(CONFIG_ARCH_OMAP4) += prcm.o
obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

2
arch/arm/mach-omap2/prcm.c
View File

@ -34,6 +34,7 @@
static void __iomem *prm_base; static void __iomem *prm_base;
static void __iomem *cm_base; static void __iomem *cm_base;
static void __iomem *cm2_base;
#define MAX_MODULE_ENABLE_WAIT 100000 #define MAX_MODULE_ENABLE_WAIT 100000
@ -258,6 +259,7 @@ void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals)
{ {
prm_base = omap2_globals->prm; prm_base = omap2_globals->prm;
cm_base = omap2_globals->cm; cm_base = omap2_globals->cm;
cm2_base = omap2_globals->cm2;
} }
#ifdef CONFIG_ARCH_OMAP3 #ifdef CONFIG_ARCH_OMAP3

5
arch/arm/plat-omap/clock.c
View File

@ -57,11 +57,6 @@ void omap2_clk_prepare_for_reboot(void)
{ {
} }
EXPORT_SYMBOL(omap2_clk_prepare_for_reboot); EXPORT_SYMBOL(omap2_clk_prepare_for_reboot);
void omap_prcm_arch_reset(char mode)
{
}
EXPORT_SYMBOL(omap_prcm_arch_reset);
#endif #endif
int clk_enable(struct clk *clk) int clk_enable(struct clk *clk)
{ {

2
arch/arm/plat-omap/common.c
View File

@ -284,12 +284,14 @@ static struct omap_globals omap4_globals = {
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE), .ctrl = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
.prm = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE), .prm = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
.cm = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE), .cm = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
.cm2 = OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE),
}; };
void __init omap2_set_globals_443x(void) void __init omap2_set_globals_443x(void)
{ {
omap2_set_globals_tap(&omap4_globals); omap2_set_globals_tap(&omap4_globals);
omap2_set_globals_control(&omap4_globals); omap2_set_globals_control(&omap4_globals);
omap2_set_globals_prcm(&omap4_globals);
} }
#endif #endif

1
arch/arm/plat-omap/include/plat/common.h
View File

@ -58,6 +58,7 @@ struct omap_globals {
void __iomem *ctrl; /* System Control Module */ void __iomem *ctrl; /* System Control Module */
void __iomem *prm; /* Power and Reset Management */ void __iomem *prm; /* Power and Reset Management */
void __iomem *cm; /* Clock Management */ void __iomem *cm; /* Clock Management */
void __iomem *cm2;
}; };
void omap2_set_globals_242x(void); void omap2_set_globals_242x(void);

6
arch/arm/plat-omap/include/plat/omap44xx.h
View File

@ -26,8 +26,10 @@
#define OMAP44XX_EMIF2_BASE 0x4d000000 #define OMAP44XX_EMIF2_BASE 0x4d000000
#define OMAP44XX_DMM_BASE 0x4e000000 #define OMAP44XX_DMM_BASE 0x4e000000
#define OMAP4430_32KSYNCT_BASE 0x4a304000 #define OMAP4430_32KSYNCT_BASE 0x4a304000
#define OMAP4430_CM_BASE 0x4a004000 #define OMAP4430_CM1_BASE 0x4a004000
#define OMAP4430_PRM_BASE 0x48306000 #define OMAP4430_CM_BASE OMAP4430_CM1_BASE
#define OMAP4430_CM2_BASE 0x4a008000
#define OMAP4430_PRM_BASE 0x4a306000
#define OMAP44XX_GPMC_BASE 0x50000000 #define OMAP44XX_GPMC_BASE 0x50000000
#define OMAP443X_SCM_BASE 0x4a002000 #define OMAP443X_SCM_BASE 0x4a002000
#define OMAP443X_CTRL_BASE OMAP443X_SCM_BASE #define OMAP443X_CTRL_BASE OMAP443X_SCM_BASE