summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include/mach/hardware.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-08-31 19:59:07 +0200
committerTony Lindgren <tony@atomide.com>2012-09-13 03:06:31 +0200
commitdbc04161048dd5e5c3c58546688a0cc0854051e9 (patch)
treee8ca621b467956ea3245dc559c33e798cc6cb6ce /arch/arm/mach-omap2/include/mach/hardware.h
parentARM: OMAP: Remove unused old gpio-switch.h (diff)
downloadlinux-dbc04161048dd5e5c3c58546688a0cc0854051e9.tar.xz
linux-dbc04161048dd5e5c3c58546688a0cc0854051e9.zip
ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
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>
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/hardware.h')
-rw-r--r--arch/arm/mach-omap2/include/mach/hardware.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/include/mach/hardware.h b/arch/arm/mach-omap2/include/mach/hardware.h
index 78edf9d33f71..54492dbf6973 100644
--- a/arch/arm/mach-omap2/include/mach/hardware.h
+++ b/arch/arm/mach-omap2/include/mach/hardware.h
@@ -1,5 +1,3 @@
/*
* arch/arm/mach-omap2/include/mach/hardware.h
*/
-
-#include <plat/hardware.h>