These macros will be used by AM33xx as well, so move them to clocks.h. Based on a patch by Teresa Gámez <t.gamez@xxxxxxxxx>. Signed-off-by: Jan Luebbe <jlu@xxxxxxxxxxxxxx> --- arch/arm/mach-omap/include/mach/clocks.h | 3 +++ arch/arm/mach-omap/include/mach/omap3-clock.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h index b2b0c99..9e47a9e 100644 --- a/arch/arm/mach-omap/include/mach/clocks.h +++ b/arch/arm/mach-omap/include/mach/clocks.h @@ -37,6 +37,9 @@ #define S26M 26000000 #define S38_4M 38400000 +#define CM_REG(REGNAME) (OMAP_CM_BASE + CM_##REGNAME) +#define PRM_REG(REGNAME) (OMAP_PRM_BASE + PRM_##REGNAME) + #ifdef CONFIG_ARCH_OMAP3 #include <mach/omap3-clock.h> #endif diff --git a/arch/arm/mach-omap/include/mach/omap3-clock.h b/arch/arm/mach-omap/include/mach/omap3-clock.h index 4f5a1d1..c36489c 100644 --- a/arch/arm/mach-omap/include/mach/omap3-clock.h +++ b/arch/arm/mach-omap/include/mach/omap3-clock.h @@ -27,8 +27,6 @@ #define _OMAP343X_CLOCKS_H_ /** CM Clock Regs Wrapper */ -#define CM_REG(REGNAME) (OMAP_CM_BASE + CM_##REGNAME) - #define CM_FCLKEN_IVA2 0X0000 #define CM_CLKEN_PLL_IVA2 0X0004 #define CM_IDLEST_PLL_IVA2 0X0024 @@ -77,7 +75,6 @@ #define CM_CLKSTCTRL_USBH 0x1448 /** PRM Clock Regs */ -#define PRM_REG(REGNAME) (OMAP_PRM_BASE + PRM_##REGNAME) #define PRM_CLKSEL 0x0D40 #define PRM_RSTCTRL 0x1250 #define PRM_CLKSRC_CTRL 0x1270 -- 1.7.10.4 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
