diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-24 10:34:35 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 10:34:35 -0800 |
| commit | ee0839c22cdda7f2e5f06e2d0351e2b49e0975ff (patch) | |
| tree | 43aae8ac684d982860304731cda8a5e5295c562e /arch/arm/plat-omap/include/plat/tc.h | |
| parent | 2e3ee9f45b3c25faa012abc9a62ab7aa515cd617 (diff) | |
| download | talos-op-linux-ee0839c22cdda7f2e5f06e2d0351e2b49e0975ff.tar.gz talos-op-linux-ee0839c22cdda7f2e5f06e2d0351e2b49e0975ff.zip | |
ARM: OMAP2+: Move most of plat/io.h into local iomap.h
There's no need to have these defines in plat/io.h.
Note that we now need to ifdef omap_read/write calls
as they will be available for omap1 only.
While at it, clean up the includes to group them like
they typically are grouped.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat/tc.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/tc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/tc.h b/arch/arm/plat-omap/include/plat/tc.h index d2fcd789bb9a..83b850f5fc08 100644 --- a/arch/arm/plat-omap/include/plat/tc.h +++ b/arch/arm/plat-omap/include/plat/tc.h @@ -89,7 +89,8 @@ * from NOR flash (using external chipselect 3) rather than mask ROM, * which uses BM to interchange the physical CS0 and CS3 addresses. */ -static inline u32 omap_cs0_phys(void) +#ifdef CONFIG_ARCH_OMAP1 +static inline u32 omap_cs0m_phys(void) { return (omap_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM) ? OMAP_CS3_PHYS : 0; @@ -100,6 +101,7 @@ static inline u32 omap_cs3_phys(void) return (omap_readl(EMIFS_CONFIG) & OMAP_EMIFS_CONFIG_BM) ? 0 : OMAP_CS3_PHYS; } +#endif #endif /* __ASSEMBLER__ */ |
