[16/16] ARM: OMAP: Make plat/omap-pm.h local to mach-omap2
Commit Message
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.
Cc: Laurent 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: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap1/pm_bus.c | 2 --
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/dsp.c | 2 +-
arch/arm/mach-omap2/gpio.c | 2 +-
arch/arm/mach-omap2/hsmmc.c | 2 +-
arch/arm/mach-omap2/i2c.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/omap-pm.h | 0
arch/arm/mach-omap2/pm-debug.c | 2 +-
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/plat-omap/dmtimer.c | 3 ++-
arch/arm/plat-omap/omap-pm-noop.c | 4 +---
drivers/media/platform/omap3isp/ispvideo.c | 1 -
drivers/media/rc/ir-rx51.c | 1 -
17 files changed, 14 insertions(+), 19 deletions(-)
rename arch/arm/{plat-omap/include/plat/omap-pm.h => mach-omap2/omap-pm.h} (100%)
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Comments
Hi Tony,
Thanks for the patch.
On Thursday 04 October 2012 15:05:10 Tony Lindgren wrote:
> 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.
drivers/media/platform/omap3isp/ispvideo.c used omap-pm.h APIs in the past, we
forgot to remove the #include when we changed that.
For the OMAP3 ISP driver,
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Laurent 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: Tony Lindgren <tony@atomide.com>
@@ -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)
{
@@ -33,7 +33,7 @@
#include "common.h"
#include <plat/dma.h>
#include <plat/gpmc.h>
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
#include "gpmc-smc91x.h"
#include "board-rx51.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"
@@ -18,7 +18,7 @@
#include <linux/platform_data/gpio-omap.h>
#include "mmc.h"
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
#include "omap_device.h"
#include "mux.h"
@@ -24,7 +24,7 @@
#include "common.h"
#include "omap_hwmod.h"
#include "omap_device.h"
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
#include "mux.h"
#include "i2c.h"
@@ -26,7 +26,7 @@
#include <asm/mach/map.h>
#include <plat/sdrc.h>
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
#include "omap_hwmod.h"
#include <plat/dma.h>
similarity index 100%
rename from arch/arm/plat-omap/include/plat/omap-pm.h
rename to arch/arm/mach-omap2/omap-pm.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"
@@ -19,7 +19,7 @@
#include <asm/system_misc.h>
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
#include "omap_device.h"
#include "common.h"
@@ -33,7 +33,7 @@
#include <plat/dma.h>
#include "omap_hwmod.h"
#include "omap_device.h"
-#include <plat/omap-pm.h>
+#include "omap-pm.h"
#include "prm2xxx_3xxx.h"
#include "pm.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;
@@ -36,7 +36,6 @@
#include <media/v4l2-ioctl.h>
#include <plat/iommu.h>
#include <plat/iovmm.h>
-#include <plat/omap-pm.h>
#include "ispvideo.h"
#include "isp.h"
@@ -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>