ARM omap: include individual SoC files
- remove mach/silicon.h and include omap?-silicon.h directly - include mach/omap?-clock.h directly where needed Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
37ad50049b
commit
19b6121a56
|
@ -15,7 +15,7 @@
|
|||
#include <ns16550.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <generated/mach-types.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap4-silicon.h>
|
||||
#include <sizes.h>
|
||||
#include <i2c/i2c.h>
|
||||
#include <gpio.h>
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
#include <ns16550.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <generated/mach-types.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include <io.h>
|
||||
#include <ns16550.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <sizes.h>
|
||||
#include <ns16550.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <asm/armlinux.h>
|
||||
#include <linux/stat.h>
|
||||
#include <generated/mach-types.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap4-silicon.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <ns16550.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <generated/mach-types.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap4-silicon.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
#include <mach/xload.h>
|
||||
#include <mach/omap3-mux.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <ns16550.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <generated/mach-types.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap4-silicon.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
#include <clock.h>
|
||||
#include <io.h>
|
||||
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/gpmc.h>
|
||||
#include <mach/gpmc_nand.h>
|
||||
|
||||
|
|
|
@ -34,11 +34,4 @@
|
|||
#define S26M 26000000
|
||||
#define S38_4M 38400000
|
||||
|
||||
#ifdef CONFIG_ARCH_OMAP3
|
||||
#include <mach/omap3-clock.h>
|
||||
#endif
|
||||
#ifdef CONFIG_ARCH_OMAP4
|
||||
#include <mach/omap4-clock.h>
|
||||
#endif
|
||||
|
||||
#endif /* __OMAP_CLOCKS_H_ */
|
||||
|
|
|
@ -130,4 +130,9 @@
|
|||
/* PRM */
|
||||
#define OMAP3_PRM_RSTCTRL_RESET 0x04
|
||||
|
||||
/* If Architecture specific init functions are present */
|
||||
#ifndef __ASSEMBLY__
|
||||
void omap3_core_init(void);
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __ASM_ARCH_OMAP3_H */
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
* (C) Copyright 2008
|
||||
* Texas Instruments, <www.ti.com>
|
||||
* Nishanth Menon <x0nishan@ti.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
*/
|
||||
#ifndef __ASM_ARCH_OMAP_SILICON_H
|
||||
#define __ASM_ARCH_OMAP_SILICON_H
|
||||
|
||||
/* Each platform silicon header comes here */
|
||||
#ifdef CONFIG_ARCH_OMAP3
|
||||
#include <mach/omap3-silicon.h>
|
||||
#endif
|
||||
#ifdef CONFIG_ARCH_OMAP4
|
||||
#include <mach/omap4-silicon.h>
|
||||
#endif
|
||||
|
||||
/* If Architecture specific init functions are present */
|
||||
#ifndef __ASSEMBLY__
|
||||
void omap3_core_init(void);
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __ASM_ARCH_OMAP_SILICON_H */
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <io.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/clocks.h>
|
||||
#include <mach/omap3-clock.h>
|
||||
#include <mach/timers.h>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <config.h>
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/assembler.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/wdt.h>
|
||||
#include <mach/clocks.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
|
|
@ -30,12 +30,13 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap3-silicon.h>
|
||||
#include <mach/gpmc.h>
|
||||
#include <mach/sdrc.h>
|
||||
#include <mach/control.h>
|
||||
#include <mach/omap3-smx.h>
|
||||
#include <mach/clocks.h>
|
||||
#include <mach/omap3-clock.h>
|
||||
#include <mach/wdt.h>
|
||||
#include <mach/sys_info.h>
|
||||
#include <mach/syslib.h>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <common.h>
|
||||
#include <io.h>
|
||||
#include <mach/syslib.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap4-silicon.h>
|
||||
#include <mach/clocks.h>
|
||||
#include <mach/omap4-clock.h>
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/omap4-clock.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/omap4-silicon.h>
|
||||
#include <mach/omap4-mux.h>
|
||||
#include <mach/syslib.h>
|
||||
#include <mach/xload.h>
|
||||
|
|
|
@ -68,7 +68,6 @@
|
|||
#include <linux/mtd/nand.h>
|
||||
#include <linux/mtd/nand_ecc.h>
|
||||
#include <io.h>
|
||||
#include <mach/silicon.h>
|
||||
#include <mach/gpmc.h>
|
||||
#include <mach/gpmc_nand.h>
|
||||
|
||||
|
|
Loading…
Reference in New Issue