ARM: OMAP: More fixes for cm and prm assembly access

More fixes for cm and prm assembly access

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 9ff918a35faa1d8aed75b55dfa8d9742e96fe5a6..e0035987eb4e8bd52f1f3e0926771077511f9650 100644 (file)
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/clk.h>
+#include <linux/io.h>
 
 #include "prm.h"
 #include "prm-regbits-24xx.h"

diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index fcc1aa04740d73c4ccb0555991967b96a8fef220..455b060665f63a05f8ea677a550a3456c99fa68d 100644 (file)
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -14,13 +14,19 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/kernel.h>
-#include <asm/io.h>
 #include "prcm-common.h"
 
-
+#ifndef __ASSEMBLER__
 #define OMAP_PRM_REGADDR(module, reg)                                  \
        (void __iomem *)IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg))
+#else
+#define OMAP2420_PRM_REGADDR(module, reg)                              \
+                       IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg))
+#define OMAP2430_PRM_REGADDR(module, reg)                              \
+                       IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg))
+#define OMAP34XX_PRM_REGADDR(module, reg)                              \
+                       IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg))
+#endif
 
 /*
  * Architecture-specific global PRM registers
@@ -91,6 +97,8 @@
 #define OMAP3430_PRM_CLKSEL            OMAP_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0040)
 #define OMAP3430_PRM_CLKOUT_CTRL       OMAP_PRM_REGADDR(OMAP3430_CCR_MOD, 0x0070)
 
+#ifndef __ASSEMBLER__
+
 /* Power/reset management global register get/set */
 
 static void __attribute__((unused)) prm_write_reg(u32 val, void __iomem *addr)
@@ -105,6 +113,7 @@ static u32 __attribute__((unused)) prm_read_reg(void __iomem *addr)
        return __raw_readl(addr);
 }
 
+#endif
 
 /*
  * Module specific PRM registers from PRM_BASE + domain offset
@@ -156,6 +165,7 @@ static u32 __attribute__((unused)) prm_read_reg(void __iomem *addr)
 #define OMAP24XX_PRCM_IRQSTATUS_IVA                    0x00f8
 #define OMAP24XX_PRCM_IRQENABLE_IVA                    0x00fc
 
+#ifndef __ASSEMBLER__
 
 /* Power/reset management domain register get/set */
 
@@ -169,6 +179,7 @@ static u32 __attribute__((unused)) prm_read_mod_reg(s16 module, s16 idx)
        return prm_read_reg(OMAP_PRM_REGADDR(module, idx));
 }
 
+#endif
 
 /*
  * Bits common to specific registers

diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index aa386210107672a3e558b1595ff2927c03974c86..928e1c4c7544e842085f3999b2e2a9264a47c8cf 100644 (file)
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -56,7 +56,7 @@ static u32 __attribute__((unused)) sms_read_reg(u16 reg)
        return __raw_readl(OMAP_SMS_REGADDR(reg));
 }
 #else
-#define OMAP242X_SDRC_REGADDR(reg)     IO_ADDRESS(OMAP242X_SDRC_BASE + (reg))
+#define OMAP242X_SDRC_REGADDR(reg)     IO_ADDRESS(OMAP2420_SDRC_BASE + (reg))
 #define OMAP243X_SDRC_REGADDR(reg)     IO_ADDRESS(OMAP243X_SDRC_BASE + (reg))
 #define OMAP34XX_SDRC_REGADDR(reg)     IO_ADDRESS(OMAP343X_SDRC_BASE + (reg))
 #endif /* __ASSEMBLER__ */