[ARM] omap: allow ioremap() to use our fixed IO mappings
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
e5480b7397
commit
690b5a13b2
3 changed files with 90 additions and 1 deletions
|
@ -4,7 +4,7 @@
|
|||
|
||||
# Common support
|
||||
obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \
|
||||
usb.o fb.o
|
||||
usb.o fb.o io.o
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
|
|
@ -192,6 +192,12 @@ extern void omap1_init_common_hw(void);
|
|||
extern void omap2_map_common_io(void);
|
||||
extern void omap2_init_common_hw(void);
|
||||
|
||||
#define __arch_ioremap(p,s,t) omap_ioremap(p,s,t)
|
||||
#define __arch_iounmap(v) omap_iounmap(v)
|
||||
|
||||
void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type);
|
||||
void omap_iounmap(volatile void __iomem *addr);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
83
arch/arm/plat-omap/io.c
Normal file
83
arch/arm/plat-omap/io.c
Normal file
|
@ -0,0 +1,83 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
#include <mach/omap730.h>
|
||||
#include <mach/omap1510.h>
|
||||
#include <mach/omap16xx.h>
|
||||
#include <mach/omap24xx.h>
|
||||
#include <mach/omap34xx.h>
|
||||
|
||||
#define BETWEEN(p,st,sz) ((p) >= (st) && (p) < ((st) + (sz)))
|
||||
#define XLATE(p,pst,vst) ((void __iomem *)((p) - (pst) + (vst)))
|
||||
|
||||
/*
|
||||
* Intercept ioremap() requests for addresses in our fixed mapping regions.
|
||||
*/
|
||||
void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
|
||||
{
|
||||
#ifdef CONFIG_ARCH_OMAP1
|
||||
if (cpu_class_is_omap1()) {
|
||||
if (BETWEEN(p, IO_PHYS, IO_SIZE))
|
||||
return XLATE(p, IO_PHYS, IO_VIRT);
|
||||
}
|
||||
if (cpu_is_omap730()) {
|
||||
if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE))
|
||||
return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START);
|
||||
|
||||
if (BETWEEN(p, OMAP730_DSPREG_BASE, OMAP730_DSPREG_SIZE))
|
||||
return XLATE(p, OMAP730_DSPREG_BASE,
|
||||
OMAP730_DSPREG_START);
|
||||
}
|
||||
if (cpu_is_omap15xx()) {
|
||||
if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE))
|
||||
return XLATE(p, OMAP1510_DSP_BASE, OMAP1510_DSP_START);
|
||||
|
||||
if (BETWEEN(p, OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_SIZE))
|
||||
return XLATE(p, OMAP1510_DSPREG_BASE,
|
||||
OMAP1510_DSPREG_START);
|
||||
}
|
||||
if (cpu_is_omap16xx()) {
|
||||
if (BETWEEN(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_SIZE))
|
||||
return XLATE(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_START);
|
||||
|
||||
if (BETWEEN(p, OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_SIZE))
|
||||
return XLATE(p, OMAP16XX_DSPREG_BASE,
|
||||
OMAP16XX_DSPREG_START);
|
||||
}
|
||||
#endif
|
||||
#ifdef CONFIG_ARCH_OMAP2
|
||||
if (cpu_class_is_omap2()) {
|
||||
if (BETWEEN(p, L3_24XX_PHYS, L3_24XX_SIZE))
|
||||
return XLATE(p, L3_24XX_PHYS, L3_24XX_VIRT);
|
||||
if (BETWEEN(p, L4_24XX_PHYS, L4_24XX_SIZE))
|
||||
return XLATE(p, L4_24XX_PHYS, L4_24XX_VIRT);
|
||||
if (BETWEEN(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_SIZE))
|
||||
return XLATE(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_VIRT);
|
||||
if (BETWEEN(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE))
|
||||
return XLATE(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE);
|
||||
if (BETWEEN(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_SIZE))
|
||||
return XLATE(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_VIRT);
|
||||
}
|
||||
#ifdef CONFIG_ARCH_OMAP2430
|
||||
if (cpu_is_omap2430()) {
|
||||
if (BETWEEN(p, L4_WK_243X_PHYS, L4_WK_243X_SIZE))
|
||||
return XLATE(L4_WK_243X_PHYS, L4_WK_243X_VIRT);
|
||||
if (BETWEEN(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_SIZE))
|
||||
return XLATE(OMAP243X_GPMC_PHYS, OMAP243X_GPMC_VIRT);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
return __arm_ioremap(p, size, type);
|
||||
}
|
||||
EXPORT_SYMBOL(omap_ioremap);
|
||||
|
||||
void omap_iounmap(volatile void __iomem *addr)
|
||||
{
|
||||
unsigned long virt = (unsigned long)addr;
|
||||
|
||||
if (virt >= VMALLOC_START && virt < VMALLOC_END)
|
||||
__iounmap(addr);
|
||||
}
|
||||
EXPORT_SYMBOL(omap_iounmap);
|
Loading…
Reference in a new issue