lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm/imx: remove cpu_is_xxx() check from __imx_ioremap()

Browse Source 
This patch adds an ioremap hook imx_ioremap to be called in
__imx_ioremap().  Any soc that needs a customized ioremap other
than __arm_ioremap() can set up this hook in soc specific call.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Shawn Guo
2011-09-28 17:16:07 +08:00
committed by Sascha Hauer
parent 41e7daf27a
commit f548897ffc
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/mach-imx/mm-imx3.c
View File

@@ -58,6 +58,23 @@ static void imx3_idle(void)
: "=r" (reg)); : "=r" (reg));
} }
static void __iomem *imx3_ioremap(unsigned long phys_addr, size_t size,
unsigned int mtype)
{
if (mtype == MT_DEVICE) {
/*
* Access all peripherals below 0x80000000 as nonshared device
* on mx3, but leave l2cc alone. Otherwise cache corruptions
* can occur.
*/
if (phys_addr < 0x80000000 &&
!addr_in_module(phys_addr, MX3x_L2CC))
mtype = MT_DEVICE_NONSHARED;
}
return __arm_ioremap(phys_addr, size, mtype);
}
void imx3_init_l2x0(void) void imx3_init_l2x0(void)
{ {
void __iomem *l2x0_base; void __iomem *l2x0_base;
@@ -127,6 +144,7 @@ void __init imx31_init_early(void)
mxc_set_cpu_type(MXC_CPU_MX31); mxc_set_cpu_type(MXC_CPU_MX31);
mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
imx_idle = imx3_idle; imx_idle = imx3_idle;
imx_ioremap = imx3_ioremap;
} }
void __init imx35_init_early(void) void __init imx35_init_early(void)
@@ -135,6 +153,7 @@ void __init imx35_init_early(void)
mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
imx_idle = imx3_idle; imx_idle = imx3_idle;
imx_ioremap = imx3_ioremap;
} }
void __init mx31_init_irq(void) void __init mx31_init_irq(void)

20
arch/arm/plat-mxc/include/mach/io.h
View File

@@ -14,32 +14,22 @@
/* Allow IO space to be anywhere in the memory */ /* Allow IO space to be anywhere in the memory */
#define IO_SPACE_LIMIT 0xffffffff #define IO_SPACE_LIMIT 0xffffffff
#if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)
#include <mach/hardware.h>
#define __arch_ioremap __imx_ioremap #define __arch_ioremap __imx_ioremap
#define __arch_iounmap __iounmap #define __arch_iounmap __iounmap
#define addr_in_module(addr, mod) \ #define addr_in_module(addr, mod) \
((unsigned long)(addr) - mod ## _BASE_ADDR < mod ## _SIZE) ((unsigned long)(addr) - mod ## _BASE_ADDR < mod ## _SIZE)
extern void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int);
static inline void __iomem * static inline void __iomem *
__imx_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) __imx_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
{ {
if (mtype == MT_DEVICE && (cpu_is_mx31() || cpu_is_mx35())) { if (imx_ioremap != NULL)
/* return imx_ioremap(phys_addr, size, mtype);
* Access all peripherals below 0x80000000 as nonshared device else
* on mx3, but leave l2cc alone. Otherwise cache corruptions
* can occur.
*/
if (phys_addr < 0x80000000 &&
!addr_in_module(phys_addr, MX3x_L2CC))
mtype = MT_DEVICE_NONSHARED;
}
return __arm_ioremap(phys_addr, size, mtype); return __arm_ioremap(phys_addr, size, mtype);
} }
#endif
/* io address mapping macro */ /* io address mapping macro */
#define __io(a) __typesafe_io(a) #define __io(a) __typesafe_io(a)

1
arch/arm/plat-mxc/system.c
View File

@@ -29,6 +29,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
void (*imx_idle)(void) = NULL; void (*imx_idle)(void) = NULL;
void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL;
static void __iomem *wdog_base; static void __iomem *wdog_base;