summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-24 10:34:33 -0800
committerTony Lindgren <tony@atomide.com>2012-02-24 10:34:33 -0800
commit258ee922d7a4b4a9cfb947ce0e24d89f1ef20eb5 (patch)
tree96b17b8ccacb8a5778e2a9fd269527a63cf9b665
parent1ca8c07bda717c683a8fb148f92ab484928414b6 (diff)
downloadblackbird-op-linux-258ee922d7a4b4a9cfb947ce0e24d89f1ef20eb5.tar.gz
blackbird-op-linux-258ee922d7a4b4a9cfb947ce0e24d89f1ef20eb5.zip
ARM: OMAP2+: Move SDRC related functions from io.h into local common.h
These should be local to omap2/3/4. Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/common.h5
-rw-r--r--arch/arm/plat-omap/include/plat/io.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index febffde2ff10..5aa1acbcc33e 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -235,5 +235,10 @@ static inline u32 omap4_mpuss_read_prev_context_state(void)
return 0;
}
#endif
+
+struct omap_sdrc_params;
+extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
+ struct omap_sdrc_params *sdrc_cs1);
+
#endif /* __ASSEMBLER__ */
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h
index 0696bae1818b..f5b386b76361 100644
--- a/arch/arm/plat-omap/include/plat/io.h
+++ b/arch/arm/plat-omap/include/plat/io.h
@@ -266,10 +266,6 @@ extern void omap_writeb(u8 v, u32 pa);
extern void omap_writew(u16 v, u32 pa);
extern void omap_writel(u32 v, u32 pa);
-struct omap_sdrc_params;
-extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
- struct omap_sdrc_params *sdrc_cs1);
-
extern void __init omap_init_consistent_dma_size(void);
#endif
OpenPOWER on IntegriCloud