diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-10-19 18:25:31 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-10-19 18:25:31 -0400 |
commit | 233fd64e7f42a7b8e827ee02528474e0fabfebdc (patch) | |
tree | 1fefbe2daf7c74a7112f00c8c2f8194bb75423c1 /arch/arm/plat-omap/io.c | |
parent | b0002e0e37de53782580a7587ad26b2131555653 (diff) |
omap: Split OMAP2_IO_ADDRESS to L3 and L4
This patch splits OMAP2_IO_ADDRESS to OMAP2_L3_IO_ADDRESS and
OMAP2_L4_IO_ADDRESS to reclaim more IO space.
The omap_read*() and omap_write*() functions will work only over
L4 address space. Current omap kernel stack uses these functions
only to access registers over L4 io address space
Note that these macros should only be used when ioremap does
not work. Please use ioremap instead in all new code.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/io.c')
-rw-r--r-- | arch/arm/plat-omap/io.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c index 23a205f4a2b1..eb74ab286081 100644 --- a/arch/arm/plat-omap/io.c +++ b/arch/arm/plat-omap/io.c | |||
@@ -142,7 +142,7 @@ u8 omap_readb(u32 pa) | |||
142 | if (cpu_class_is_omap1()) | 142 | if (cpu_class_is_omap1()) |
143 | return __raw_readb(OMAP1_IO_ADDRESS(pa)); | 143 | return __raw_readb(OMAP1_IO_ADDRESS(pa)); |
144 | else | 144 | else |
145 | return __raw_readb(OMAP2_IO_ADDRESS(pa)); | 145 | return __raw_readb(OMAP2_L4_IO_ADDRESS(pa)); |
146 | } | 146 | } |
147 | EXPORT_SYMBOL(omap_readb); | 147 | EXPORT_SYMBOL(omap_readb); |
148 | 148 | ||
@@ -151,7 +151,7 @@ u16 omap_readw(u32 pa) | |||
151 | if (cpu_class_is_omap1()) | 151 | if (cpu_class_is_omap1()) |
152 | return __raw_readw(OMAP1_IO_ADDRESS(pa)); | 152 | return __raw_readw(OMAP1_IO_ADDRESS(pa)); |
153 | else | 153 | else |
154 | return __raw_readw(OMAP2_IO_ADDRESS(pa)); | 154 | return __raw_readw(OMAP2_L4_IO_ADDRESS(pa)); |
155 | } | 155 | } |
156 | EXPORT_SYMBOL(omap_readw); | 156 | EXPORT_SYMBOL(omap_readw); |
157 | 157 | ||
@@ -160,7 +160,7 @@ u32 omap_readl(u32 pa) | |||
160 | if (cpu_class_is_omap1()) | 160 | if (cpu_class_is_omap1()) |
161 | return __raw_readl(OMAP1_IO_ADDRESS(pa)); | 161 | return __raw_readl(OMAP1_IO_ADDRESS(pa)); |
162 | else | 162 | else |
163 | return __raw_readl(OMAP2_IO_ADDRESS(pa)); | 163 | return __raw_readl(OMAP2_L4_IO_ADDRESS(pa)); |
164 | } | 164 | } |
165 | EXPORT_SYMBOL(omap_readl); | 165 | EXPORT_SYMBOL(omap_readl); |
166 | 166 | ||
@@ -169,7 +169,7 @@ void omap_writeb(u8 v, u32 pa) | |||
169 | if (cpu_class_is_omap1()) | 169 | if (cpu_class_is_omap1()) |
170 | __raw_writeb(v, OMAP1_IO_ADDRESS(pa)); | 170 | __raw_writeb(v, OMAP1_IO_ADDRESS(pa)); |
171 | else | 171 | else |
172 | __raw_writeb(v, OMAP2_IO_ADDRESS(pa)); | 172 | __raw_writeb(v, OMAP2_L4_IO_ADDRESS(pa)); |
173 | } | 173 | } |
174 | EXPORT_SYMBOL(omap_writeb); | 174 | EXPORT_SYMBOL(omap_writeb); |
175 | 175 | ||
@@ -178,7 +178,7 @@ void omap_writew(u16 v, u32 pa) | |||
178 | if (cpu_class_is_omap1()) | 178 | if (cpu_class_is_omap1()) |
179 | __raw_writew(v, OMAP1_IO_ADDRESS(pa)); | 179 | __raw_writew(v, OMAP1_IO_ADDRESS(pa)); |
180 | else | 180 | else |
181 | __raw_writew(v, OMAP2_IO_ADDRESS(pa)); | 181 | __raw_writew(v, OMAP2_L4_IO_ADDRESS(pa)); |
182 | } | 182 | } |
183 | EXPORT_SYMBOL(omap_writew); | 183 | EXPORT_SYMBOL(omap_writew); |
184 | 184 | ||
@@ -187,6 +187,6 @@ void omap_writel(u32 v, u32 pa) | |||
187 | if (cpu_class_is_omap1()) | 187 | if (cpu_class_is_omap1()) |
188 | __raw_writel(v, OMAP1_IO_ADDRESS(pa)); | 188 | __raw_writel(v, OMAP1_IO_ADDRESS(pa)); |
189 | else | 189 | else |
190 | __raw_writel(v, OMAP2_IO_ADDRESS(pa)); | 190 | __raw_writel(v, OMAP2_L4_IO_ADDRESS(pa)); |
191 | } | 191 | } |
192 | EXPORT_SYMBOL(omap_writel); | 192 | EXPORT_SYMBOL(omap_writel); |