ARM: OMAP2+: Make omap-wakeupgen.h local

This can be local to mach-omap2.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h b/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
deleted file mode 100644 (file)
index b0fd16f..0000000
--- a/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * OMAP WakeupGen header file
- *
- * Copyright (C) 2011 Texas Instruments, Inc.
- *     Santosh Shilimkar <santosh.shilimkar@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef OMAP_ARCH_WAKEUPGEN_H
-#define OMAP_ARCH_WAKEUPGEN_H
-
-/* OMAP4 and OMAP5 has same base address */
-#define OMAP_WKUPGEN_BASE                      0x48281000
-
-#define OMAP_WKG_CONTROL_0                     0x00
-#define OMAP_WKG_ENB_A_0                       0x10
-#define OMAP_WKG_ENB_B_0                       0x14
-#define OMAP_WKG_ENB_C_0                       0x18
-#define OMAP_WKG_ENB_D_0                       0x1c
-#define OMAP_WKG_ENB_E_0                       0x20
-#define OMAP_WKG_ENB_A_1                       0x410
-#define OMAP_WKG_ENB_B_1                       0x414
-#define OMAP_WKG_ENB_C_1                       0x418
-#define OMAP_WKG_ENB_D_1                       0x41c
-#define OMAP_WKG_ENB_E_1                       0x420
-#define OMAP_AUX_CORE_BOOT_0                   0x800
-#define OMAP_AUX_CORE_BOOT_1                   0x804
-#define OMAP_PTMSYNCREQ_MASK                   0xc00
-#define OMAP_PTMSYNCREQ_EN                     0xc04
-#define OMAP_TIMESTAMPCYCLELO                  0xc08
-#define OMAP_TIMESTAMPCYCLEHI                  0xc0c
-
-extern int __init omap_wakeupgen_init(void);
-extern void __iomem *omap_get_wakeupgen_base(void);
-extern int omap_secure_apis_support(void);
-#endif

diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index 414083b427df7a4abff4ed98c2ae11e3a715f0a4..765a2aceb665f69b75c1edda980032d4c599bc66 100644 (file)
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -20,7 +20,7 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 
 #include "common.h"
 

diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index cf2b32e99cb7cf79a57a32b2cca7b07a7e4e09e8..06d8bc3a8886e0b09f0d5f46e97f767a7991af39 100644 (file)
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -25,7 +25,7 @@
 #include <asm/smp_scu.h>
 
 #include "omap-secure.h"
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 #include <asm/cputype.h>
 
 #include "soc.h"

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index 7b7d613d568de7f0ce2a5b882b60e4022dbc4b9e..4c965ab426ca5630afbdf59ccfa60b1e43fd1796 100644 (file)
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -27,7 +27,7 @@
 
 #include <asm/hardware/gic.h>
 
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 #include "omap-secure.h"
 
 #include "soc.h"

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.h b/arch/arm/mach-omap2/omap-wakeupgen.h
new file mode 100644 (file)
index 0000000..b0fd16f
--- /dev/null
+++ b/arch/arm/mach-omap2/omap-wakeupgen.h
@@ -0,0 +1,38 @@
+/*
+ * OMAP WakeupGen header file
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *     Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef OMAP_ARCH_WAKEUPGEN_H
+#define OMAP_ARCH_WAKEUPGEN_H
+
+/* OMAP4 and OMAP5 has same base address */
+#define OMAP_WKUPGEN_BASE                      0x48281000
+
+#define OMAP_WKG_CONTROL_0                     0x00
+#define OMAP_WKG_ENB_A_0                       0x10
+#define OMAP_WKG_ENB_B_0                       0x14
+#define OMAP_WKG_ENB_C_0                       0x18
+#define OMAP_WKG_ENB_D_0                       0x1c
+#define OMAP_WKG_ENB_E_0                       0x20
+#define OMAP_WKG_ENB_A_1                       0x410
+#define OMAP_WKG_ENB_B_1                       0x414
+#define OMAP_WKG_ENB_C_1                       0x418
+#define OMAP_WKG_ENB_D_1                       0x41c
+#define OMAP_WKG_ENB_E_1                       0x420
+#define OMAP_AUX_CORE_BOOT_0                   0x800
+#define OMAP_AUX_CORE_BOOT_1                   0x804
+#define OMAP_PTMSYNCREQ_MASK                   0xc00
+#define OMAP_PTMSYNCREQ_EN                     0xc04
+#define OMAP_TIMESTAMPCYCLELO                  0xc08
+#define OMAP_TIMESTAMPCYCLEHI                  0xc0c
+
+extern int __init omap_wakeupgen_init(void);
+extern void __iomem *omap_get_wakeupgen_base(void);
+extern int omap_secure_apis_support(void);
+#endif

diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 73c1440a82532680b148eaa534328328d2430a64..9fc865502f0ce0e5a169690a1a44ccb170fe3239 100644 (file)
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -29,7 +29,7 @@
 #include <plat/omap-secure.h>
 #include <plat/mmc.h>
 
-#include <mach/omap-wakeupgen.h>
+#include "omap-wakeupgen.h"
 
 #include "soc.h"
 #include "common.h"