This is a patch series from Shawn Guo that moves from individual
late_initcalls() to using a member in the machine structure to invoke
a platform's late initcalls.
This cleanup is a step in the move towards multiplatform kernels since
it would reduce the need to check for compatible platforms in each and
every initcall.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPwHYJAAoJEIwa5zzehBx3PugP/2Wd6HN030iO5EhFBcBcrh5T
WaJ4KfzK3tWev5QA3idvenVNhk5My1HQ+PLij7BLpjNqKCKlNK0k/K9wMI5X827T
wkFFprdUcoMVrB1ZCjzwCk4/uTGWB5BMxoZ6mlBh1sZIR/yXo91t+wO971Uqr0ho
Ky1oW9uaPZ6Eja00iDLkfJfygquA5+zNb0a29q19zWnHlRkH76jtqZgfDKy9I2nq
virYZ4uhoPnY2g1JxhnaMNNC861CgfTDEtmtNjgeEbA6t9bbjqsZoQRhcYHZP4OM
a4Iu8FOyIvAAzQzUglfAZ4Ar4uYTmVRnG39XFh4wK/8tJYt0hEQwFS26B0pYKx/5
F76bwc4SqO7H9AWBF0WhyUbny5XmJcNwJjobm/oCeAvemTi3xA6BbubyfKMHPoIr
dDSEqcAcMt9G6sS48h3Pm0caEYDVzxf202vdylz1JABiJZi1W/7v+NMdhujfotJh
7IGehNRu0foPEsRIS9wsvD2TzSdQtDdjyFkGHd83XMc3JpvwmyePO6ynbbxrVnJJ
HzlPnbLIk3VyqyVCqVXj21NKEY1dbsYPItketAwwzc1BUGcld0qvQY/t/UI4JQT6
9vq77AwNjUhfomDdEWTp7aNx0whkY0R5KEY9jHjuu9WoE+xdPZbQKm589AJ6LA4U
j6HPMzWKUHOKT6g10rCl
=21h6
-----END PGP SIGNATURE-----
Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull sweeping late_initcall cleanup for arm-soc from Olof Johansson:
"This is a patch series from Shawn Guo that moves from individual
late_initcalls() to using a member in the machine structure to invoke
a platform's late initcalls.
This cleanup is a step in the move towards multiplatform kernels since
it would reduce the need to check for compatible platforms in each and
every initcall."
Fix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,
imx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,
in the case of cpuimx51.c the board support being deleted)
* tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: ux500: use machine specific hook for late init
ARM: tegra: use machine specific hook for late init
ARM: shmobile: use machine specific hook for late init
ARM: sa1100: use machine specific hook for late init
ARM: s3c64xx: use machine specific hook for late init
ARM: prima2: use machine specific hook for late init
ARM: pnx4008: use machine specific hook for late init
ARM: omap2: use machine specific hook for late init
ARM: omap1: use machine specific hook for late init
ARM: msm: use machine specific hook for late init
ARM: imx: use machine specific hook for late init
ARM: exynos: use machine specific hook for late init
ARM: ep93xx: use machine specific hook for late init
ARM: davinci: use machine specific hook for late init
ARM: provide a late_initcall hook for platform initialization
183 lines
3.8 KiB
C
183 lines
3.8 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/io.c
|
|
*
|
|
* OMAP1 I/O mapping code
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/tlb.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <plat/mux.h>
|
|
#include <plat/tc.h>
|
|
#include <plat/dma.h>
|
|
|
|
#include "iomap.h"
|
|
#include "common.h"
|
|
#include "clock.h"
|
|
|
|
/*
|
|
* The machine specific code may provide the extra mapping besides the
|
|
* default mapping provided here.
|
|
*/
|
|
static struct map_desc omap_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP1_IO_VIRT,
|
|
.pfn = __phys_to_pfn(OMAP1_IO_PHYS),
|
|
.length = OMAP1_IO_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
|
|
#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
|
|
static struct map_desc omap7xx_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP7XX_DSP_BASE,
|
|
.pfn = __phys_to_pfn(OMAP7XX_DSP_START),
|
|
.length = OMAP7XX_DSP_SIZE,
|
|
.type = MT_DEVICE
|
|
}, {
|
|
.virtual = OMAP7XX_DSPREG_BASE,
|
|
.pfn = __phys_to_pfn(OMAP7XX_DSPREG_START),
|
|
.length = OMAP7XX_DSPREG_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
static struct map_desc omap1510_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP1510_DSP_BASE,
|
|
.pfn = __phys_to_pfn(OMAP1510_DSP_START),
|
|
.length = OMAP1510_DSP_SIZE,
|
|
.type = MT_DEVICE
|
|
}, {
|
|
.virtual = OMAP1510_DSPREG_BASE,
|
|
.pfn = __phys_to_pfn(OMAP1510_DSPREG_START),
|
|
.length = OMAP1510_DSPREG_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
static struct map_desc omap16xx_io_desc[] __initdata = {
|
|
{
|
|
.virtual = OMAP16XX_DSP_BASE,
|
|
.pfn = __phys_to_pfn(OMAP16XX_DSP_START),
|
|
.length = OMAP16XX_DSP_SIZE,
|
|
.type = MT_DEVICE
|
|
}, {
|
|
.virtual = OMAP16XX_DSPREG_BASE,
|
|
.pfn = __phys_to_pfn(OMAP16XX_DSPREG_START),
|
|
.length = OMAP16XX_DSPREG_SIZE,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
#endif
|
|
|
|
/*
|
|
* Maps common IO regions for omap1
|
|
*/
|
|
static void __init omap1_map_common_io(void)
|
|
{
|
|
iotable_init(omap_io_desc, ARRAY_SIZE(omap_io_desc));
|
|
}
|
|
|
|
#if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
|
|
void __init omap7xx_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
iotable_init(omap7xx_io_desc, ARRAY_SIZE(omap7xx_io_desc));
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
void __init omap15xx_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
void __init omap16xx_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
iotable_init(omap16xx_io_desc, ARRAY_SIZE(omap16xx_io_desc));
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Common low-level hardware init for omap1.
|
|
*/
|
|
void __init omap1_init_early(void)
|
|
{
|
|
omap_check_revision();
|
|
|
|
/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
|
|
* on a Posted Write in the TIPB Bridge".
|
|
*/
|
|
omap_writew(0x0, MPU_PUBLIC_TIPB_CNTL);
|
|
omap_writew(0x0, MPU_PRIVATE_TIPB_CNTL);
|
|
|
|
/* Must init clocks early to assure that timer interrupt works
|
|
*/
|
|
omap1_clk_init();
|
|
omap1_mux_init();
|
|
omap_init_consistent_dma_size();
|
|
}
|
|
|
|
void __init omap1_init_late(void)
|
|
{
|
|
omap_serial_wakeup_init();
|
|
}
|
|
|
|
/*
|
|
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
|
|
*/
|
|
|
|
u8 omap_readb(u32 pa)
|
|
{
|
|
return __raw_readb(OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_readb);
|
|
|
|
u16 omap_readw(u32 pa)
|
|
{
|
|
return __raw_readw(OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_readw);
|
|
|
|
u32 omap_readl(u32 pa)
|
|
{
|
|
return __raw_readl(OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_readl);
|
|
|
|
void omap_writeb(u8 v, u32 pa)
|
|
{
|
|
__raw_writeb(v, OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_writeb);
|
|
|
|
void omap_writew(u16 v, u32 pa)
|
|
{
|
|
__raw_writew(v, OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_writew);
|
|
|
|
void omap_writel(u32 v, u32 pa)
|
|
{
|
|
__raw_writel(v, OMAP1_IO_ADDRESS(pa));
|
|
}
|
|
EXPORT_SYMBOL(omap_writel);
|