Commit 1d5aef49 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Make plat/omap-pm.h local to mach-omap2



We must move this for ARM common zImage support.

Note that neither drivers/media/rc/ir-rx51.c or
drivers/media/platform/omap3isp/ispvideo.c need
to include omap-pm.h, so this patch removes the
include for those files.
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Cc: linux-media@vger.kernel.org
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent dc843280
......@@ -19,8 +19,6 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <plat/omap-pm.h>
#ifdef CONFIG_PM_RUNTIME
static int omap1_pm_runtime_suspend(struct device *dev)
{
......
......@@ -32,7 +32,6 @@
#include "common.h"
#include <plat-omap/dma-omap.h>
#include <plat/omap-pm.h>
#include "gpmc-smc91x.h"
#include "board-rx51.h"
......@@ -51,6 +50,7 @@
#endif
#include "mux.h"
#include "omap-pm.h"
#include "hsmmc.h"
#include "common-board-devices.h"
#include "gpmc.h"
......
......@@ -27,7 +27,7 @@
#include <video/omapdss.h>
#include "omap_hwmod.h"
#include "omap_device.h"
#include <plat/omap-pm.h>
#include "omap-pm.h"
#include "common.h"
#include "iomap.h"
......
......@@ -27,7 +27,7 @@
#include "cm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
#ifdef CONFIG_BRIDGE_DVFS
#include <plat/omap-pm.h>
#include "omap-pm.h"
#endif
#include <linux/platform_data/dsp-omap.h>
......
......@@ -25,7 +25,7 @@
#include "omap_hwmod.h"
#include "omap_device.h"
#include <plat/omap-pm.h>
#include "omap-pm.h"
#include "powerdomain.h"
......
......@@ -17,8 +17,8 @@
#include <mach/hardware.h>
#include <linux/platform_data/gpio-omap.h>
#include <plat/omap-pm.h>
#include "omap_device.h"
#include "omap-pm.h"
#include "mux.h"
#include "mmc.h"
......
......@@ -26,7 +26,6 @@
#include <asm/mach/map.h>
#include <plat/serial.h>
#include <plat/omap-pm.h>
#include <plat-omap/dma-omap.h>
#include "../plat-omap/sram.h"
......@@ -42,6 +41,7 @@
#include "clock2xxx.h"
#include "clock3xxx.h"
#include "clock44xx.h"
#include "omap-pm.h"
#include "sdrc.h"
/*
......
......@@ -31,7 +31,7 @@
#include "powerdomain.h"
#include "clockdomain.h"
#include <plat/dmtimer.h>
#include <plat/omap-pm.h>
#include "omap-pm.h"
#include "cm2xxx_3xxx.h"
#include "prm2xxx_3xxx.h"
......
......@@ -20,7 +20,7 @@
#include <asm/system_misc.h>
#include <plat/omap-pm.h>
#include "omap-pm.h"
#include "omap_device.h"
#include "common.h"
......
......@@ -29,12 +29,12 @@
#include <plat/omap-serial.h>
#include <plat-omap/dma-omap.h>
#include <plat/omap-pm.h>
#include <plat/serial.h>
#include "common.h"
#include "omap_hwmod.h"
#include "omap_device.h"
#include "omap-pm.h"
#include "prm2xxx_3xxx.h"
#include "pm.h"
#include "cm2xxx_3xxx.h"
......
......@@ -46,7 +46,7 @@
#include "omap_hwmod.h"
#include "omap_device.h"
#include <plat/dmtimer.h>
#include <plat/omap-pm.h>
#include "omap-pm.h"
#include "soc.h"
#include "common.h"
......
......@@ -42,10 +42,11 @@
#include <linux/pm_runtime.h>
#include <plat/dmtimer.h>
#include <plat/omap-pm.h>
#include <mach/hardware.h>
#include "../mach-omap2/omap-pm.h"
static u32 omap_reserved_systimers;
static LIST_HEAD(omap_timer_list);
static DEFINE_SPINLOCK(dm_timer_lock);
......
......@@ -22,10 +22,8 @@
#include <linux/device.h>
#include <linux/platform_device.h>
/* Interface documentation is in mach/omap-pm.h */
#include <plat/omap-pm.h>
#include "../mach-omap2/omap_device.h"
#include "../mach-omap2/omap-pm.h"
static bool off_mode_enabled;
static int dummy_context_loss_counter;
......
......@@ -28,7 +28,6 @@
#include <plat/dmtimer.h>
#include <plat/clock.h>
#include <plat/omap-pm.h>
#include <media/lirc.h>
#include <media/lirc_dev.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment