Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / arch / arm / mach-omap2 / control.c

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index a5d86a49c213a57328db56d38ef547b42cee55c5..5f3aad9778426fb575e437823335346c5a477957 100644 (file)
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -13,22 +13,21 @@
 #undef DEBUG
 
 #include <linux/kernel.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
+#include <mach/common.h>
+#include <mach/control.h>
 
-#include <asm/arch/control.h>
+static void __iomem *omap2_ctrl_base;
 
-static u32 omap2_ctrl_base;
+#define OMAP_CTRL_REGADDR(reg)         (omap2_ctrl_base + (reg))
 
-#define OMAP_CTRL_REGADDR(reg) (void __iomem *)IO_ADDRESS(omap2_ctrl_base \
-                                                               + (reg))
-
-void omap_ctrl_base_set(u32 base)
+void __init omap2_set_globals_control(struct omap_globals *omap2_globals)
 {
-       omap2_ctrl_base = base;
+       omap2_ctrl_base = omap2_globals->ctrl;
 }
 
-u32 omap_ctrl_base_get(void)
+void __iomem *omap_ctrl_base_get(void)
 {
        return omap2_ctrl_base;
 }
@@ -50,25 +49,16 @@ u32 omap_ctrl_readl(u16 offset)
 
 void omap_ctrl_writeb(u8 val, u16 offset)
 {
-       pr_debug("omap_ctrl_writeb: writing 0x%0x to 0x%0x\n", val,
-                (u32)OMAP_CTRL_REGADDR(offset));
-
        __raw_writeb(val, OMAP_CTRL_REGADDR(offset));
 }
 
 void omap_ctrl_writew(u16 val, u16 offset)
 {
-       pr_debug("omap_ctrl_writew: writing 0x%0x to 0x%0x\n", val,
-                (u32)OMAP_CTRL_REGADDR(offset));
-
        __raw_writew(val, OMAP_CTRL_REGADDR(offset));
 }
 
 void omap_ctrl_writel(u32 val, u16 offset)
 {
-       pr_debug("omap_ctrl_writel: writing 0x%0x to 0x%0x\n", val,
-                (u32)OMAP_CTRL_REGADDR(offset));
-
        __raw_writel(val, OMAP_CTRL_REGADDR(offset));
 }