Commit 9890ce44 (ARM: get rid of asm/irq.h in asm/prom.h) removed include of asm/irq.h in asm/prom.h. This commit together with recent omap cleanup to remove io.h causes build breakage: arrch/arm/mach-omap2/control.c: In function 'omap3_ctrl_write_boot_mode': arch/arm/mach-omap2/control.c:238: error: 'OMAP343X_CTRL_BASE' undeclared (first use in this function) ... Fix this by including hardware.h directly where needed instead of relying on asm/irq.h in asm/prom.h. Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
		
			
				
	
	
		
			183 lines
		
	
	
	
		
			4.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			183 lines
		
	
	
	
		
			4.5 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/hardware.h>
 | 
						|
#include <plat/board.h>
 | 
						|
#include <plat/mux.h>
 | 
						|
#include <plat/clock.h>
 | 
						|
 | 
						|
#include "iomap.h"
 | 
						|
#include "common.h"
 | 
						|
#include "sdrc.h"
 | 
						|
#include "control.h"
 | 
						|
 | 
						|
/* Global address base setup code */
 | 
						|
 | 
						|
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 | 
						|
 | 
						|
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);
 | 
						|
}
 | 
						|
 | 
						|
#endif
 | 
						|
 | 
						|
#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();
 | 
						|
}
 | 
						|
 | 
						|
#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),
 | 
						|
};
 | 
						|
 | 
						|
void __init omap2_set_globals_443x(void)
 | 
						|
{
 | 
						|
	omap2_set_globals_tap(&omap4_globals);
 | 
						|
	omap2_set_globals_control(&omap4_globals);
 | 
						|
	omap2_set_globals_prcm(&omap4_globals);
 | 
						|
}
 | 
						|
 | 
						|
void __init omap4_map_io(void)
 | 
						|
{
 | 
						|
	omap44xx_map_common_io();
 | 
						|
}
 | 
						|
#endif
 | 
						|
 |