msm: pm: Move pm.h back into "mach-msm" from "mach-msm/include/mach"
APIs in this header are no longer needed outside of mach-msm.
Move the header out of include/mach to discourage use of it
in device drivers.
Change-Id: Id87eab2c909d01e4146d79d62f9c61a80e66fd64
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 3e99b2a..a95d733 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -49,7 +49,6 @@
#include <asm/setup.h>
#include <mach/dma.h>
#include <mach/msm_bus_board.h>
-#include <mach/pm.h>
#include <mach/cpuidle.h>
#include "msm_watchdog.h"
@@ -58,6 +57,7 @@
#include "spm.h"
#include "mpm.h"
#include "rpm_resources.h"
+#include "pm.h"
#include "pm-boot.h"
#include "devices-msm8x60.h"
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index f080d50..3858e63 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -81,7 +81,7 @@
#include "devices.h"
#include "devices-msm8x60.h"
#include "spm.h"
-#include <mach/pm.h>
+#include "pm.h"
#include <mach/cpuidle.h>
#include "rpm_resources.h"
#include "mpm.h"
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 075f358..9985b32 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -87,7 +87,7 @@
#include "devices-msm8x60.h"
#include "spm.h"
#include "board-8960.h"
-#include <mach/pm.h>
+#include "pm.h"
#include <mach/cpuidle.h>
#include "rpm_resources.h"
#include "mpm.h"
diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index 9c0a80e..84a8a42 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -35,7 +35,7 @@
#include "devices.h"
#include "board-9615.h"
#include <mach/cpuidle.h>
-#include <mach/pm.h>
+#include "pm.h"
#include "acpuclock.h"
#include "pm-boot.h"
diff --git a/arch/arm/mach-msm/board-fsm9xxx.c b/arch/arm/mach-msm/board-fsm9xxx.c
index 36ab719..87fea3f 100644
--- a/arch/arm/mach-msm/board-fsm9xxx.c
+++ b/arch/arm/mach-msm/board-fsm9xxx.c
@@ -38,7 +38,7 @@
#include "devices.h"
#include "timer.h"
#include "acpuclock.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "spm.h"
#include <linux/regulator/consumer.h>
#include <linux/regulator/machine.h>
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c
index 5c189fe..8eb92a4 100644
--- a/arch/arm/mach-msm/board-msm7x27.c
+++ b/arch/arm/mach-msm/board-msm7x27.c
@@ -68,7 +68,7 @@
#include "clock.h"
#include "acpuclock.h"
#include "msm-keypad-devices.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "pm-boot.h"
#ifdef CONFIG_ARCH_MSM7X25
diff --git a/arch/arm/mach-msm/board-msm7x27a.c b/arch/arm/mach-msm/board-msm7x27a.c
index 0437134..d2add18 100644
--- a/arch/arm/mach-msm/board-msm7x27a.c
+++ b/arch/arm/mach-msm/board-msm7x27a.c
@@ -50,7 +50,7 @@
#include "timer.h"
#include "board-msm7x27a-regulator.h"
#include "devices-msm7x2xa.h"
-#include <mach/pm.h>
+#include "pm.h"
#include <mach/rpc_server_handset.h>
#include <mach/socinfo.h>
#include "pm-boot.h"
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 3e7b7f4..e0b3c49 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -78,7 +78,7 @@
#include <linux/usb/android.h>
#include <mach/usbdiag.h>
#endif
-#include <mach/pm.h>
+#include "pm.h"
#include "pm-boot.h"
#include "spm.h"
#include "acpuclock.h"
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 5cb022e..29f5fac 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -89,7 +89,7 @@
#include "devices.h"
#include "devices-msm8x60.h"
#include <mach/cpuidle.h>
-#include <mach/pm.h>
+#include "pm.h"
#include "mpm.h"
#include "spm.h"
#include "rpm_log.h"
diff --git a/arch/arm/mach-msm/board-qrd7627a.c b/arch/arm/mach-msm/board-qrd7627a.c
index 5052bb0..1222b67 100644
--- a/arch/arm/mach-msm/board-qrd7627a.c
+++ b/arch/arm/mach-msm/board-qrd7627a.c
@@ -49,7 +49,7 @@
#include "board-msm7x27a-regulator.h"
#include "devices.h"
#include "devices-msm7x2xa.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "timer.h"
#include "pm-boot.h"
#include "board-msm7x27a-regulator.h"
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index 65aaa9a..5a77333 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -54,7 +54,7 @@
#include "timer.h"
#include "msm-keypad-devices.h"
#include "acpuclock.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "pm-boot.h"
#include "proc_comm.h"
#ifdef CONFIG_USB_ANDROID
diff --git a/arch/arm/mach-msm/cpuidle.c b/arch/arm/mach-msm/cpuidle.c
index abaa925..cccba2d 100644
--- a/arch/arm/mach-msm/cpuidle.c
+++ b/arch/arm/mach-msm/cpuidle.c
@@ -17,7 +17,8 @@
#include <linux/cpu_pm.h>
#include <mach/cpuidle.h>
-#include <mach/pm.h>
+
+#include "pm.h"
static DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuidle_device, msm_cpuidle_devs);
static struct cpuidle_driver msm_cpuidle_driver = {
diff --git a/arch/arm/mach-msm/devices-9615.c b/arch/arm/mach-msm/devices-9615.c
index 4fc05ce..1f2256f 100644
--- a/arch/arm/mach-msm/devices-9615.c
+++ b/arch/arm/mach-msm/devices-9615.c
@@ -30,7 +30,7 @@
#include <asm/hardware/cache-l2x0.h>
#include <mach/msm_sps.h>
#include <mach/dma.h>
-#include <mach/pm.h>
+#include "pm.h"
#include "devices.h"
#include "mpm.h"
#include "spm.h"
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index 743e3de..2e615eb 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -13,8 +13,7 @@
#include <asm/cacheflush.h>
#include <asm/vfp.h>
-#include <mach/pm.h>
-
+#include "pm.h"
#include "qdss.h"
#include "spm.h"
diff --git a/arch/arm/mach-msm/include/mach/cpuidle.h b/arch/arm/mach-msm/include/mach/cpuidle.h
index b0aa902..37b8d00 100644
--- a/arch/arm/mach-msm/include/mach/cpuidle.h
+++ b/arch/arm/mach-msm/include/mach/cpuidle.h
@@ -15,7 +15,7 @@
#define __ARCH_ARM_MACH_MSM_CPUIDLE_H
#include <linux/notifier.h>
-#include <mach/pm.h>
+#include "pm.h"
struct msm_cpuidle_state {
unsigned int cpu;
diff --git a/arch/arm/mach-msm/no-pm.c b/arch/arm/mach-msm/no-pm.c
index f51286f..d1c474b 100644
--- a/arch/arm/mach-msm/no-pm.c
+++ b/arch/arm/mach-msm/no-pm.c
@@ -15,7 +15,7 @@
#include <mach/cpuidle.h>
#include "idle.h"
-#include <mach/pm.h>
+#include "pm.h"
void arch_idle(void)
{ }
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index f1c6c48..3c422009 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -25,7 +25,7 @@
#include <mach/hardware.h>
#include <mach/msm_iomap.h>
-#include <mach/pm.h>
+#include "pm.h"
#include "scm-boot.h"
#include "spm.h"
diff --git a/arch/arm/mach-msm/pm-8x60.c b/arch/arm/mach-msm/pm-8x60.c
index 9bdc2b3..b3c6d1e 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -44,7 +44,7 @@
#include "avs.h"
#include <mach/cpuidle.h>
#include "idle.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "rpm_resources.h"
#include "scm-boot.h"
#include "spm.h"
diff --git a/arch/arm/mach-msm/pm.c b/arch/arm/mach-msm/pm.c
index 3dcbfb3..d684a5a 100644
--- a/arch/arm/mach-msm/pm.c
+++ b/arch/arm/mach-msm/pm.c
@@ -44,7 +44,7 @@
#include "irq.h"
#include "gpio.h"
#include "timer.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "pm-boot.h"
enum {
diff --git a/arch/arm/mach-msm/include/mach/pm.h b/arch/arm/mach-msm/pm.h
similarity index 100%
rename from arch/arm/mach-msm/include/mach/pm.h
rename to arch/arm/mach-msm/pm.h
diff --git a/arch/arm/mach-msm/pm2.c b/arch/arm/mach-msm/pm2.c
index 0518ea2..4cdd7ae 100644
--- a/arch/arm/mach-msm/pm2.c
+++ b/arch/arm/mach-msm/pm2.c
@@ -58,7 +58,7 @@
#include "irq.h"
#include "gpio.h"
#include "timer.h"
-#include <mach/pm.h>
+#include "pm.h"
#include "spm.h"
#include "sirc.h"
#include "pm-boot.h"
diff --git a/arch/arm/mach-msm/rpm_resources.h b/arch/arm/mach-msm/rpm_resources.h
index da9d3ff..a5c61b2 100644
--- a/arch/arm/mach-msm/rpm_resources.h
+++ b/arch/arm/mach-msm/rpm_resources.h
@@ -15,7 +15,7 @@
#define __ARCH_ARM_MACH_MSM_RPM_RESOURCES_H
#include <mach/rpm.h>
-#include <mach/pm.h>
+#include "pm.h"
enum {
MSM_RPMRS_ID_PXO_CLK = 0,