Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb0d0ee1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2/3: Remove OMAP_CM_REGADDR 



Processor specific macros should be used instead.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c28150ee

arch/arm/mach-omap2/clock24xx.h

+2 −0
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ 


/* REVISIT: These should be set dynamically for CONFIG_MULTI_OMAP2 */

#ifdef CONFIG_ARCH_OMAP2420

#define OMAP_CM_REGADDR			OMAP2420_CM_REGADDR

#define OMAP24XX_PRCM_CLKOUT_CTRL	OMAP2420_PRCM_CLKOUT_CTRL

#define OMAP24XX_PRCM_CLKEMUL_CTRL	OMAP2420_PRCM_CLKEMUL_CTRL

#else

#define OMAP_CM_REGADDR			OMAP2430_CM_REGADDR

#define OMAP24XX_PRCM_CLKOUT_CTRL	OMAP2430_PRCM_CLKOUT_CTRL

#define OMAP24XX_PRCM_CLKEMUL_CTRL	OMAP2430_PRCM_CLKEMUL_CTRL

#endif

arch/arm/mach-omap2/clock34xx.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include "prm.h"

#include "prm-regbits-34xx.h"



#define OMAP_CM_REGADDR		OMAP34XX_CM_REGADDR



static unsigned long omap3_dpll_recalc(struct clk *clk);

static unsigned long omap3_clkoutx2_recalc(struct clk *clk);

static void omap3_dpll_allow_idle(struct clk *clk);

arch/arm/mach-omap2/cm.h

+0 −5
Original line number Diff line number Diff line
@@ -16,17 +16,12 @@ 


#include "prcm-common.h"



#ifndef __ASSEMBLER__

#define OMAP_CM_REGADDR(module, reg)					\

			IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg))

#else

#define OMAP2420_CM_REGADDR(module, reg)				\

			IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))

#define OMAP2430_CM_REGADDR(module, reg)				\

			IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg))

#define OMAP34XX_CM_REGADDR(module, reg)				\

			IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg))

#endif



/*

 * Architecture-specific global CM registers

arch/arm/plat-omap/include/mach/omap24xx.h

+0 −10
Original line number Diff line number Diff line
@@ -85,15 +85,5 @@ 
#define OMAP24XX_SEC_AES_BASE	(OMAP24XX_SEC_BASE + 0x6000)

#define OMAP24XX_SEC_PKA_BASE	(OMAP24XX_SEC_BASE + 0x8000)



#if defined(CONFIG_ARCH_OMAP2420)



#define OMAP2_CM_BASE		OMAP2420_CM_BASE



#elif defined(CONFIG_ARCH_OMAP2430)



#define OMAP2_CM_BASE		OMAP2430_CM_BASE



#endif



#endif /* __ASM_ARCH_OMAP24XX_H */

arch/arm/plat-omap/include/mach/omap34xx.h

+0 −6
Original line number Diff line number Diff line
@@ -83,12 +83,6 @@ 


#define OMAP34XX_MAILBOX_BASE		(L4_34XX_BASE + 0x94000)



#if defined(CONFIG_ARCH_OMAP3430)



#define OMAP2_CM_BASE			OMAP3430_CM_BASE



#endif



#define OMAP34XX_DSP_BASE	0x58000000

#define OMAP34XX_DSP_MEM_BASE	(OMAP34XX_DSP_BASE + 0x0)

#define OMAP34XX_DSP_IPI_BASE	(OMAP34XX_DSP_BASE + 0x1000000)