ARM: OMAP2: Add video driver the Gumstix Overo board (rev 3)

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

diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index 896b578bcee6ae6614a6e29658172662fcc1529b..1a8bbd094066acd7ae0cc5a4ca56b7bc58fc93c3 100644 (file)
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -15,7 +15,7 @@
  */
 #undef DEBUG
 
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 
 #ifndef __ASSEMBLER__
 extern void __iomem *omap2_sdrc_base;
@@ -26,30 +26,24 @@ extern void __iomem *omap2_sms_base;
 
 /* SDRC global register get/set */
 
-static void sdrc_write_reg(u32 val, u16 reg)
+static inline void sdrc_write_reg(u32 val, u16 reg)
 {
-       pr_debug("sdrc_write_reg: writing 0x%0x to 0x%0x\n", val,
-                (__force u32)OMAP_SDRC_REGADDR(reg));
-
        __raw_writel(val, OMAP_SDRC_REGADDR(reg));
 }
 
-static u32 sdrc_read_reg(u16 reg)
+static inline u32 sdrc_read_reg(u16 reg)
 {
        return __raw_readl(OMAP_SDRC_REGADDR(reg));
 }
 
 /* SMS global register get/set */
 
-static void sms_write_reg(u32 val, u16 reg)
+static inline void sms_write_reg(u32 val, u16 reg)
 {
-       pr_debug("sms_write_reg: writing 0x%0x to 0x%0x\n", val,
-                (__force u32)OMAP_SMS_REGADDR(reg));
-
        __raw_writel(val, OMAP_SMS_REGADDR(reg));
 }
 
-static u32 sms_read_reg(u16 reg)
+static inline u32 sms_read_reg(u16 reg)
 {
        return __raw_readl(OMAP_SMS_REGADDR(reg));
 }