diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:19:04 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:19:04 -0600 |
| commit | 07f5bd7a7ca1cc269ecff76c0e89f868bc13019a (patch) | |
| tree | a5eb254aa46c19118fb6af5cb942b15a1e92847f /include | |
| parent | 3958bcec9da87bb69d76618ebce07f2aae55602b (diff) | |
Sony's implementation of __mxc_ioremap, ported to our kernel.
Patch of Sony's implementation of __mxc_ioremap, ported to the
linux 2.6.22 MX kernel.
Copyright Sony Corporation.
Note: The contents of this patch ends up being completely
replaced by code written by Freescale.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-Sony-s-implementation-of-__mxc_ioremap-por.patch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-mxc/io.h | 7 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/mx27.h | 6 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/mx31.h | 12 |
3 files changed, 25 insertions, 0 deletions
diff --git a/include/asm-arm/arch-mxc/io.h b/include/asm-arm/arch-mxc/io.h index 46a1f6aad35a..f85abcd0e42c 100644 --- a/include/asm-arm/arch-mxc/io.h +++ b/include/asm-arm/arch-mxc/io.h @@ -46,4 +46,11 @@ */ #define iomem_to_phys(iomem) (iomem) +extern void __iomem *__mxc_ioremap(unsigned long cookie, size_t size, + unsigned int mtype); +extern void __mxc_iounmap(void __iomem *addr); + +#define __arch_ioremap(a, s, f) __mxc_ioremap(a, s, f) +#define __arch_iounmap(a) __mxc_iounmap(a) + #endif diff --git a/include/asm-arm/arch-mxc/mx27.h b/include/asm-arm/arch-mxc/mx27.h index e44460c10404..bce0f3164e98 100644 --- a/include/asm-arm/arch-mxc/mx27.h +++ b/include/asm-arm/arch-mxc/mx27.h @@ -178,6 +178,12 @@ ((x >= X_MEMC_BASE_ADDR) && (x < (X_MEMC_BASE_ADDR + X_MEMC_SIZE))) ? X_MEMC_IO_ADDRESS(x):\ 0xDEADBEEF) +#define IS_STATIC_MAPPED(x) \ + ((((x) >= AIPI_BASE_ADDR_VIRT) && ((x) < (AIPI_BASE_ADDR_VIRT + AIPI_SIZE))) || \ + (((x) >= SAHB1_BASE_ADDR_VIRT) && ((x) < (SAHB1_BASE_ADDR_VIRT + SAHB1_SIZE))) || \ + (((x) >= CS4_BASE_ADDR_VIRT) && ((x) < (CS4_BASE_ADDR_VIRT + CS4_SIZE))) || \ + (((x) >= X_MEMC_BASE_ADDR_VIRT) && ((x) < (X_MEMC_BASE_ADDR_VIRT + X_MEMC_SIZE)))) + /* * define the address mapping macros: in physical address order */ diff --git a/include/asm-arm/arch-mxc/mx31.h b/include/asm-arm/arch-mxc/mx31.h index 6ea3c1eda1ab..9c38165ced05 100644 --- a/include/asm-arm/arch-mxc/mx31.h +++ b/include/asm-arm/arch-mxc/mx31.h @@ -257,6 +257,18 @@ ((x >= X_MEMC_BASE_ADDR) && (x < (X_MEMC_BASE_ADDR + X_MEMC_SIZE))) ? X_MEMC_IO_ADDRESS(x):\ 0xDEADBEEF) +#define IS_STATIC_MAPPED(x) \ + ((((x) >= IRAM_BASE_ADDR_VIRT) && ((x) < (IRAM_BASE_ADDR_VIRT + IRAM_SIZE))) || \ + (((x) >= AIPS1_BASE_ADDR_VIRT) && ((x) < (AIPS1_BASE_ADDR_VIRT + AIPS1_SIZE))) || \ + (((x) >= SPBA0_BASE_ADDR_VIRT) && ((x) < (SPBA0_BASE_ADDR_VIRT + SPBA0_SIZE))) || \ + (((x) >= AIPS2_BASE_ADDR_VIRT) && ((x) < (AIPS2_BASE_ADDR_VIRT + AIPS2_SIZE))) || \ + (((x) >= ROMP_BASE_ADDR_VIRT) && ((x) < (ROMP_BASE_ADDR_VIRT + ROMP_SIZE))) || \ + (((x) >= AVIC_BASE_ADDR_VIRT) && ((x) < (AVIC_BASE_ADDR_VIRT + AVIC_SIZE))) || \ + (((x) >= CS4_BASE_ADDR_VIRT) && ((x) < (CS4_BASE_ADDR_VIRT + CS4_SIZE))) || \ + (((x) >= X_MEMC_BASE_ADDR_VIRT) && ((x) < (X_MEMC_BASE_ADDR_VIRT + X_MEMC_SIZE)))) + + + /* * define the address mapping macros: in physical address order */ |