diff options
author | Tony Lindgren <tony@atomide.com> | 2009-05-25 14:26:46 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-05-25 14:26:46 -0400 |
commit | ef6685a6ded6a20ff33a868cc2c0dba0505b7e4c (patch) | |
tree | 780f185d336be66b40ab4faf98dfab30b9d6553c /arch | |
parent | 07b95d000d48bd44e6f573566c1eba985ef25ed4 (diff) |
ARM: OMAP2/3: Remove OMAP_CM_REGADDR
Processor specific macros should be used instead.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/cm.h | 5 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap24xx.h | 10 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/omap34xx.h | 6 |
5 files changed, 4 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index f0e4480b4ebe..458f00cdcbea 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h | |||
@@ -26,9 +26,11 @@ | |||
26 | 26 | ||
27 | /* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */ | 27 | /* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */ |
28 | #ifdef CONFIG_ARCH_OMAP2420 | 28 | #ifdef CONFIG_ARCH_OMAP2420 |
29 | #define OMAP_CM_REGADDR OMAP2420_CM_REGADDR | ||
29 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2420_PRCM_CLKOUT_CTRL | 30 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2420_PRCM_CLKOUT_CTRL |
30 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2420_PRCM_CLKEMUL_CTRL | 31 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2420_PRCM_CLKEMUL_CTRL |
31 | #else | 32 | #else |
33 | #define OMAP_CM_REGADDR OMAP2430_CM_REGADDR | ||
32 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2430_PRCM_CLKOUT_CTRL | 34 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP2430_PRCM_CLKOUT_CTRL |
33 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2430_PRCM_CLKEMUL_CTRL | 35 | #define OMAP24XX_PRCM_CLKEMUL_CTRL OMAP2430_PRCM_CLKEMUL_CTRL |
34 | #endif | 36 | #endif |
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 017a30e9aa1d..496f0e9caeb2 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
@@ -27,6 +27,8 @@ | |||
27 | #include "prm.h" | 27 | #include "prm.h" |
28 | #include "prm-regbits-34xx.h" | 28 | #include "prm-regbits-34xx.h" |
29 | 29 | ||
30 | #define OMAP_CM_REGADDR OMAP34XX_CM_REGADDR | ||
31 | |||
30 | static unsigned long omap3_dpll_recalc(struct clk *clk); | 32 | static unsigned long omap3_dpll_recalc(struct clk *clk); |
31 | static unsigned long omap3_clkoutx2_recalc(struct clk *clk); | 33 | static unsigned long omap3_clkoutx2_recalc(struct clk *clk); |
32 | static void omap3_dpll_allow_idle(struct clk *clk); | 34 | static void omap3_dpll_allow_idle(struct clk *clk); |
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h index efc082a1d271..1d3c93bf86d3 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h | |||
@@ -16,17 +16,12 @@ | |||
16 | 16 | ||
17 | #include "prcm-common.h" | 17 | #include "prcm-common.h" |
18 | 18 | ||
19 | #ifndef __ASSEMBLER__ | ||
20 | #define OMAP_CM_REGADDR(module, reg) \ | ||
21 | IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) | ||
22 | #else | ||
23 | #define OMAP2420_CM_REGADDR(module, reg) \ | 19 | #define OMAP2420_CM_REGADDR(module, reg) \ |
24 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) | 20 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) |
25 | #define OMAP2430_CM_REGADDR(module, reg) \ | 21 | #define OMAP2430_CM_REGADDR(module, reg) \ |
26 | IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg)) | 22 | IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg)) |
27 | #define OMAP34XX_CM_REGADDR(module, reg) \ | 23 | #define OMAP34XX_CM_REGADDR(module, reg) \ |
28 | IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg)) |
29 | #endif | ||
30 | 25 | ||
31 | /* | 26 | /* |
32 | * Architecture-specific global CM registers | 27 | * Architecture-specific global CM registers |
diff --git a/arch/arm/plat-omap/include/mach/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h index 60f832449249..696edfc145a6 100644 --- a/arch/arm/plat-omap/include/mach/omap24xx.h +++ b/arch/arm/plat-omap/include/mach/omap24xx.h | |||
@@ -85,15 +85,5 @@ | |||
85 | #define OMAP24XX_SEC_AES_BASE (OMAP24XX_SEC_BASE + 0x6000) | 85 | #define OMAP24XX_SEC_AES_BASE (OMAP24XX_SEC_BASE + 0x6000) |
86 | #define OMAP24XX_SEC_PKA_BASE (OMAP24XX_SEC_BASE + 0x8000) | 86 | #define OMAP24XX_SEC_PKA_BASE (OMAP24XX_SEC_BASE + 0x8000) |
87 | 87 | ||
88 | #if defined(CONFIG_ARCH_OMAP2420) | ||
89 | |||
90 | #define OMAP2_CM_BASE OMAP2420_CM_BASE | ||
91 | |||
92 | #elif defined(CONFIG_ARCH_OMAP2430) | ||
93 | |||
94 | #define OMAP2_CM_BASE OMAP2430_CM_BASE | ||
95 | |||
96 | #endif | ||
97 | |||
98 | #endif /* __ASM_ARCH_OMAP24XX_H */ | 88 | #endif /* __ASM_ARCH_OMAP24XX_H */ |
99 | 89 | ||
diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h index 36c99ca08252..cc2573330dc8 100644 --- a/arch/arm/plat-omap/include/mach/omap34xx.h +++ b/arch/arm/plat-omap/include/mach/omap34xx.h | |||
@@ -83,12 +83,6 @@ | |||
83 | 83 | ||
84 | #define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) | 84 | #define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) |
85 | 85 | ||
86 | #if defined(CONFIG_ARCH_OMAP3430) | ||
87 | |||
88 | #define OMAP2_CM_BASE OMAP3430_CM_BASE | ||
89 | |||
90 | #endif | ||
91 | |||
92 | #define OMAP34XX_DSP_BASE 0x58000000 | 86 | #define OMAP34XX_DSP_BASE 0x58000000 |
93 | #define OMAP34XX_DSP_MEM_BASE (OMAP34XX_DSP_BASE + 0x0) | 87 | #define OMAP34XX_DSP_MEM_BASE (OMAP34XX_DSP_BASE + 0x0) |
94 | #define OMAP34XX_DSP_IPI_BASE (OMAP34XX_DSP_BASE + 0x1000000) | 88 | #define OMAP34XX_DSP_IPI_BASE (OMAP34XX_DSP_BASE + 0x1000000) |