OMAP2/3 clock: use clk->prcm_mod for all struct clk register addressing

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / cm.h

diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index bd7bd6eb8983f6daa51dddb5bebac50242526472..7750becd5d37c692295c29feb2037726460e003f 100644 (file)
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -33,25 +33,7 @@
 #define OMAP3430_CM_SYSCONFIG          OMAP34XX_CM_REGADDR(OCP_MOD, 0x0010)
 #define OMAP3430_CM_POLCTRL            OMAP34XX_CM_REGADDR(OCP_MOD, 0x009c)
 
-#define OMAP3430_CM_CLKOUT_CTRL                                                \
-                               OMAP34XX_CM_REGADDR(OMAP3430_CCR_MOD, 0x0070)
-
-#ifndef __ASSEMBLER__
-
-/* Read-modify-write bits in a CM register */
-static inline u32 cm_rmw_reg_bits(u32 mask, u32 bits, void __iomem *va)
-{
-       u32 v;
-
-       v = __raw_readl(va);
-       v &= ~mask;
-       v |= bits;
-       __raw_writel(v, va);
-
-       return v;
-}
-
-#endif
+#define OMAP3430_CM_CLKOUT_CTRL_OFFSET                 0x0070
 
 /*
  * Module specific CM registers from CM_BASE + domain offset