diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:25:19 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:25:19 -0600 |
| commit | ae800b8c0e127e6f58c00fc1aed85ec87288f212 (patch) | |
| tree | 5cea30010cbffed221dd62672e2e322c57761942 /include/asm-arm | |
| parent | 5f4f72844194949c73457d0943ff5d4d1bb1f3ac (diff) | |
CR ENGR00050502 add custom ioremap
Patch for CR ENGR00050502: add custom ioremap function to ensure IO
register access through peripheral port. Applies to linux 2.6.22
kernel on MX platforms.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-CR-ENGR00050502-add-custom-ioremap.patch
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-mxc/io.h | 7 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/mx27.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-mxc/mxc.h | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/asm-arm/arch-mxc/io.h b/include/asm-arm/arch-mxc/io.h index f85abcd0e42c..e8c7b1f4cd4a 100644 --- a/include/asm-arm/arch-mxc/io.h +++ b/include/asm-arm/arch-mxc/io.h @@ -14,7 +14,7 @@ /*! * @file arch-mxc/io.h * @brief This file contains some memory mapping macros. - * @note There is no real ISA or PCI buses. But have to define these macros + * @note We don't have a PCI bus, but we have to define these macros * for some drivers to compile. * * @ingroup MSL_MX27 MSL_MX31 @@ -34,7 +34,6 @@ #define __io(a) ((void __iomem *)(a)) #define __mem_pci(a) (a) -#define __mem_isa(a) (a) /*! * Validate the pci memory address for ioremap. @@ -50,7 +49,7 @@ 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) +#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 bce0f3164e98..cd003b4eeb5f 100644 --- a/include/asm-arm/arch-mxc/mx27.h +++ b/include/asm-arm/arch-mxc/mx27.h @@ -205,6 +205,8 @@ #define PCMCIA_IO_ADDRESS(x) \ (((x) - X_MEMC_BASE_ADDR) + X_MEMC_BASE_ADDR_VIRT) +#define IS_MEM_DEVICE_NONSHARED(x) 0 + /* * MX27 ADS Interrupt numbers */ diff --git a/include/asm-arm/arch-mxc/mxc.h b/include/asm-arm/arch-mxc/mxc.h index 564297701029..209f85419460 100644 --- a/include/asm-arm/arch-mxc/mxc.h +++ b/include/asm-arm/arch-mxc/mxc.h @@ -172,6 +172,11 @@ int mxc_snoop_get_status(u32 num, u32 * statl, u32 * stath); #define DPTC_WP_SUPPORTED 17 +#ifndef IS_MEM_DEVICE_NONSHARED +/* all peripherals on MXC so far are below 0x80000000 but leave L2CC alone */ +#define IS_MEM_DEVICE_NONSHARED(x) ((x) < 0x80000000 && (x) != L2CC_BASE_ADDR) +#endif + #ifndef __ASSEMBLY__ #include <linux/types.h> struct dptc_wp { |