diff options
Diffstat (limited to 'arch')
28 files changed, 30 insertions, 29 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c index 7868e75..8a74ec5 100644 --- 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 diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index fe40d9e..46d9071 100644 --- 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 diff --git a/arch/arm/mach-omap2/am35xx-emac.c b/arch/arm/mach-omap2/am35xx-emac.c index d0c54c5..af11dcd 100644 --- 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" diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index f11a5eb..2064917 100644 --- 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" diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index e9ee9d9..48c0def 100644 --- 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" diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 28f5087..55661d0 100644 --- 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" diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index 4e3ac6b..7ddc6c9 100644 --- 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; diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 72e0f01b..67991ea 100644 --- 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) diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c index d1058f1..2bd2467 100644 --- 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" diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 9472541..7dff7ff 100644 --- 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" diff --git a/arch/arm/mach-omap2/hdq1w.c b/arch/arm/mach-omap2/hdq1w.c index e003f2b..a533ce3 100644 --- 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" diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index ec6c223..797e8c6 100644 --- 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" diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c index 8763c85..5856521 100644 --- 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, diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c index 9f12f63..84b0d9f 100644 --- 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" diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index b2c7f23..a106c75 100644 --- 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. diff --git a/arch/arm/mach-omap2/msdi.c b/arch/arm/mach-omap2/msdi.c index a6020d7..46bf98a 100644 --- 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" diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/mach-omap2/omap_device.c index 7a7d1f2..e5fbcb5 100644 --- a/arch/arm/plat-omap/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> diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/mach-omap2/omap_device.h index 106f506..106f506 100644 --- a/arch/arm/plat-omap/include/plat/omap_device.h +++ b/arch/arm/mach-omap2/omap_device.h diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c index 58e16ae..bd41d59 100644 --- 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" diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index ea61c329..4f749a1 100644 --- 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" diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c index 2a79176..4b3230f 100644 --- 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"}; diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 67c4196..5df6dd9 100644 --- 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> diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index f8217a5..1536aa8f 100644 --- 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" diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 44f9aa7..a2ea2f3 100644 --- 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> diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index 3c43449..84d8228 100644 --- 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" diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 51da21c..24f300a 100644 --- 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" diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index dacaee0..9c81cf5 100644 --- 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 diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c index 9722f41..3c96b56 100644 --- 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; |
