ARM: OMAP: Make omap_device local to mach-omap2

Let's make omap_device local to mach-omap2 for ARM common zImage support. Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-10-02 17:25:48 -07:00 · 2012-10-02 17:25:48 -07:00 · 25c7d49ed4
commit 25c7d49ed4
parent 622297fdec
28 changed files with 30 additions and 29 deletions
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@ -19,7 +19,6 @@
 #include <linux/clk.h>
 #include <linux/err.h>

-#include <plat/omap_device.h>
 #include <plat/omap-pm.h>

 #ifdef CONFIG_PM_RUNTIME
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@ -4,7 +4,8 @@

 # Common support
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
-	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o
+	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
+	 omap_device.o

 # INTCPS IP block support - XXX should be moved to drivers/
 obj-$(CONFIG_ARCH_OMAP2)		+= irq.o
--- a/arch/arm/mach-omap2/am35xx-emac.c
+++ b/arch/arm/mach-omap2/am35xx-emac.c
@ -18,7 +18,7 @@
 #include <linux/err.h>
 #include <linux/davinci_emac.h>
 #include <asm/system.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include "am35xx.h"
 #include "control.h"
 #include "am35xx-emac.h"
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@ -44,7 +44,7 @@
 #include "gpmc.h"
 #include <linux/platform_data/mtd-nand-omap2.h>
 #include <plat/usb.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "mux.h"
 #include "hsmmc.h"
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@ -26,7 +26,7 @@
 #include "iomap.h"
 #include <plat-omap/dma-omap.h>
 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include "omap4-keypad.h"

 #include "soc.h"
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@ -26,7 +26,7 @@

 #include <video/omapdss.h>
 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include <plat/omap-pm.h>
 #include "common.h"

--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@ -29,9 +29,10 @@
 #include <linux/device.h>

 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
 #include <plat-omap/dma-omap.h>

+#include "omap_device.h"
+
 #define OMAP2_DMA_STRIDE	0x60

 static u32 errata;
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>

-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include <plat/omap_hwmod.h>

 #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@ -24,7 +24,7 @@
 #include <linux/platform_data/gpio-omap.h>

 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include <plat/omap-pm.h>

 #include "powerdomain.h"
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@ -31,10 +31,10 @@
 #include <asm/mach-types.h>

 #include <plat/cpu.h>
-#include <plat/omap_device.h>

 #include "soc.h"
 #include "common.h"
+#include "omap_device.h"
 #include "gpmc.h"

 #define	DEVICE_NAME		"omap-gpmc"
--- a/arch/arm/mach-omap2/hdq1w.c
+++ b/arch/arm/mach-omap2/hdq1w.c
@ -28,7 +28,7 @@
 #include <linux/platform_device.h>

 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include "hdq1w.h"

 #include "common.h"
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@ -18,7 +18,7 @@
 #include <linux/platform_data/gpio-omap.h>

 #include <plat/omap-pm.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "mux.h"
 #include "mmc.h"
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@ -22,7 +22,7 @@
 #include <linux/hwspinlock.h>

 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
 	.base_id = 0,
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@ -21,7 +21,7 @@

 #include "common.h"
 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "mux.h"
 #include "i2c.h"
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@ -19,10 +19,11 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <linux/pm_runtime.h>

 #include <plat-omap/dma-omap.h>
-#include <plat/omap_device.h>
-#include <linux/pm_runtime.h>
+
+#include "omap_device.h"

 /*
 * FIXME: Find a mechanism to enable/disable runtime the McBSP ICLK autoidle.
--- a/arch/arm/mach-omap2/msdi.c
+++ b/arch/arm/mach-omap2/msdi.c
@ -26,10 +26,9 @@
 #include <linux/platform_data/gpio-omap.h>

 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
-
 #include "common.h"
 #include "control.h"
+#include "omap_device.h"
 #include "mux.h"
 #include "mmc.h"

--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@ -89,7 +89,7 @@
 #include <linux/of.h>
 #include <linux/notifier.h>

-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include <plat/omap_hwmod.h>
 #include <plat/clock.h>

--- a/arch/arm/plat-omap/include/plat/omap_device.h
+++ b/arch/arm/plat-omap/include/plat/omap_device.h
--- a/arch/arm/mach-omap2/opp.c
+++ b/arch/arm/mach-omap2/opp.c
@ -20,7 +20,7 @@
 #include <linux/opp.h>
 #include <linux/cpu.h>

-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "omap_opp_data.h"

--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@ -21,7 +21,7 @@
 #include <asm/system_misc.h>

 #include <plat/omap-pm.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include "common.h"

 #include "prcm-common.h"
--- a/arch/arm/mach-omap2/pmu.c
+++ b/arch/arm/mach-omap2/pmu.c
@ -16,7 +16,7 @@
 #include <asm/pmu.h>

 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 static char *omap2_pmu_oh_names[] = {"mpu"};
 static char *omap3_pmu_oh_names[] = {"mpu", "debugss"};
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@ -31,7 +31,7 @@
 #include "common.h"
 #include <plat-omap/dma-omap.h>
 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include <plat/omap-pm.h>
 #include <plat/serial.h>

--- a/arch/arm/mach-omap2/sr_device.c
+++ b/arch/arm/mach-omap2/sr_device.c
@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/io.h>

-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "voltage.h"
 #include "control.h"
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@ -44,7 +44,7 @@

 #include <asm/arch_timer.h>
 #include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"
 #include <plat/dmtimer.h>
 #include <plat/omap-pm.h>

--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@ -26,7 +26,7 @@
 #include <asm/io.h>

 #include <plat/usb.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "mux.h"

--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@ -26,7 +26,7 @@
 #include <linux/usb/musb.h>

 #include <plat/usb.h>
-#include <plat/omap_device.h>
+#include "omap_device.h"

 #include "am35xx.h"

--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@ -9,7 +9,6 @@ obj-n :=
 obj-  :=

 # omap_device support (OMAP2+ only at the moment)
-obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o

 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
--- a/arch/arm/plat-omap/omap-pm-noop.c
+++ b/arch/arm/plat-omap/omap-pm-noop.c
@ -24,7 +24,8 @@

 /* Interface documentation is in mach/omap-pm.h */
 #include <plat/omap-pm.h>
-#include <plat/omap_device.h>
+
+#include "../mach-omap2/omap_device.h"

 static bool off_mode_enabled;
 static int dummy_context_loss_counter;