![Tony Lindgren](/assets/img/avatar_default.png)
As the plat and mach includes need to disappear for single zImage work, we need to remove plat/hardware.h. Do this by splitting plat/hardware.h into omap1 and omap2+ specific files. The old plat/hardware.h already has omap1 only defines, so it gets moved to mach/hardware.h for omap1. For omap2+, we use the local soc.h that for now just includes the related SoC headers to keep this patch more readable. Note that the local soc.h still includes plat/cpu.h that can be dealt with in later patches. Let's also include plat/serial.h from common.h for all the board-*.c files. This allows making the include files local later on without patching these files again. Note that only minimal changes are done in this patch for the drivers/watchdog/omap_wdt.c driver to keep things compiling. Further patches are needed to eventually remove cpu_is_omap usage in the drivers. Also only minimal changes are done to sound/soc/omap/* to remove the unneeded includes and to define OMAP44XX_MCPDM_L3_BASE locally so there's no need to include omap44xx.h. While at it, also sort some of the includes in the standard way. Cc: linux-watchdog@vger.kernel.org Cc: alsa-devel@alsa-project.org Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Acked-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
204 lines
5.1 KiB
C
204 lines
5.1 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/common.c
|
|
*
|
|
* Code common to all OMAP2+ machines.
|
|
*
|
|
* Copyright (C) 2009 Texas Instruments
|
|
* Copyright (C) 2010 Nokia Corporation
|
|
* Tony Lindgren <tony@atomide.com>
|
|
* Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com>
|
|
*
|
|
* 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/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <plat/mux.h>
|
|
#include <plat/clock.h>
|
|
|
|
#include "soc.h"
|
|
#include "iomap.h"
|
|
#include "common.h"
|
|
#include "sdrc.h"
|
|
#include "control.h"
|
|
|
|
/* Global address base setup code */
|
|
|
|
static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
|
|
{
|
|
omap2_set_globals_tap(omap2_globals);
|
|
omap2_set_globals_sdrc(omap2_globals);
|
|
omap2_set_globals_control(omap2_globals);
|
|
omap2_set_globals_prcm(omap2_globals);
|
|
}
|
|
|
|
#if defined(CONFIG_SOC_OMAP2420)
|
|
|
|
static struct omap_globals omap242x_globals = {
|
|
.class = OMAP242X_CLASS,
|
|
.tap = OMAP2_L4_IO_ADDRESS(0x48014000),
|
|
.sdrc = OMAP2_L3_IO_ADDRESS(OMAP2420_SDRC_BASE),
|
|
.sms = OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE),
|
|
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE),
|
|
.prm = OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE),
|
|
.cm = OMAP2_L4_IO_ADDRESS(OMAP2420_CM_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_242x(void)
|
|
{
|
|
__omap2_set_globals(&omap242x_globals);
|
|
}
|
|
|
|
void __init omap242x_map_io(void)
|
|
{
|
|
omap242x_map_common_io();
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SOC_OMAP2430)
|
|
|
|
static struct omap_globals omap243x_globals = {
|
|
.class = OMAP243X_CLASS,
|
|
.tap = OMAP2_L4_IO_ADDRESS(0x4900a000),
|
|
.sdrc = OMAP2_L3_IO_ADDRESS(OMAP243X_SDRC_BASE),
|
|
.sms = OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE),
|
|
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE),
|
|
.prm = OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE),
|
|
.cm = OMAP2_L4_IO_ADDRESS(OMAP2430_CM_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_243x(void)
|
|
{
|
|
__omap2_set_globals(&omap243x_globals);
|
|
}
|
|
|
|
void __init omap243x_map_io(void)
|
|
{
|
|
omap243x_map_common_io();
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP3)
|
|
|
|
static struct omap_globals omap3_globals = {
|
|
.class = OMAP343X_CLASS,
|
|
.tap = OMAP2_L4_IO_ADDRESS(0x4830A000),
|
|
.sdrc = OMAP2_L3_IO_ADDRESS(OMAP343X_SDRC_BASE),
|
|
.sms = OMAP2_L3_IO_ADDRESS(OMAP343X_SMS_BASE),
|
|
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE),
|
|
.prm = OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE),
|
|
.cm = OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_3xxx(void)
|
|
{
|
|
__omap2_set_globals(&omap3_globals);
|
|
}
|
|
|
|
void __init omap3_map_io(void)
|
|
{
|
|
omap34xx_map_common_io();
|
|
}
|
|
|
|
/*
|
|
* Adjust TAP register base such that omap3_check_revision accesses the correct
|
|
* TI81XX register for checking device ID (it adds 0x204 to tap base while
|
|
* TI81XX DEVICE ID register is at offset 0x600 from control base).
|
|
*/
|
|
#define TI81XX_TAP_BASE (TI81XX_CTRL_BASE + \
|
|
TI81XX_CONTROL_DEVICE_ID - 0x204)
|
|
|
|
static struct omap_globals ti81xx_globals = {
|
|
.class = OMAP343X_CLASS,
|
|
.tap = OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE),
|
|
.ctrl = OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),
|
|
.prm = OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE),
|
|
.cm = OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_ti81xx(void)
|
|
{
|
|
__omap2_set_globals(&ti81xx_globals);
|
|
}
|
|
|
|
void __init ti81xx_map_io(void)
|
|
{
|
|
omapti81xx_map_common_io();
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SOC_AM33XX)
|
|
#define AM33XX_TAP_BASE (AM33XX_CTRL_BASE + \
|
|
TI81XX_CONTROL_DEVICE_ID - 0x204)
|
|
|
|
static struct omap_globals am33xx_globals = {
|
|
.class = AM335X_CLASS,
|
|
.tap = AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE),
|
|
.ctrl = AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),
|
|
.prm = AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE),
|
|
.cm = AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_am33xx(void)
|
|
{
|
|
__omap2_set_globals(&am33xx_globals);
|
|
}
|
|
|
|
void __init am33xx_map_io(void)
|
|
{
|
|
omapam33xx_map_common_io();
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP4)
|
|
static struct omap_globals omap4_globals = {
|
|
.class = OMAP443X_CLASS,
|
|
.tap = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
|
|
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
|
|
.ctrl_pad = OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE),
|
|
.prm = OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE),
|
|
.cm = OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),
|
|
.cm2 = OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE),
|
|
.prcm_mpu = OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_443x(void)
|
|
{
|
|
__omap2_set_globals(&omap4_globals);
|
|
}
|
|
|
|
void __init omap4_map_io(void)
|
|
{
|
|
omap44xx_map_common_io();
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SOC_OMAP5)
|
|
static struct omap_globals omap5_globals = {
|
|
.class = OMAP54XX_CLASS,
|
|
.tap = OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
|
|
.ctrl = OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
|
|
.ctrl_pad = OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE),
|
|
.prm = OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE),
|
|
.cm = OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_AON_BASE),
|
|
.cm2 = OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE),
|
|
.prcm_mpu = OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE),
|
|
};
|
|
|
|
void __init omap2_set_globals_5xxx(void)
|
|
{
|
|
omap2_set_globals_tap(&omap5_globals);
|
|
omap2_set_globals_control(&omap5_globals);
|
|
omap2_set_globals_prcm(&omap5_globals);
|
|
}
|
|
|
|
void __init omap5_map_io(void)
|
|
{
|
|
omap5_map_common_io();
|
|
}
|
|
#endif
|