msm: move pm and cpuidle to machine include directory
Some drivers need to know if a cpu exited out from a idle sleep.
Move the cpuidle.h which contains prototypes for the notifier registration
and pm.h which contains the sleep state definitions to include/mach.
The drivers interested in knowing exit and entry in to idle states need to
register with the notifier using msm_cpuidle_register_notifier.
Change-Id: I204860313a57840c32f2256bd8682eafe678dad8
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 8bd11a0..b846c43 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -82,8 +82,8 @@
#include "devices.h"
#include "devices-msm8x60.h"
#include "spm.h"
-#include "pm.h"
-#include "cpuidle.h"
+#include <mach/pm.h>
+#include <mach/cpuidle.h>
#include "rpm_resources.h"
#include "mpm.h"
#include "acpuclock.h"
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 3881019..13cb051 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -87,8 +87,8 @@
#include "devices-msm8x60.h"
#include "spm.h"
#include "board-8960.h"
-#include "pm.h"
-#include "cpuidle.h"
+#include <mach/pm.h>
+#include <mach/cpuidle.h>
#include "rpm_resources.h"
#include "mpm.h"
#include "acpuclock.h"
diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index 93e8fdf..37e4606 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -33,8 +33,8 @@
#include "timer.h"
#include "devices.h"
#include "board-9615.h"
-#include "cpuidle.h"
-#include "pm.h"
+#include <mach/cpuidle.h>
+#include <mach/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 87fea3f..36ab719 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 "pm.h"
+#include <mach/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 e84417c..9385a58 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 "pm.h"
+#include <mach/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 9a6f1e1..7aab1bd 100644
--- a/arch/arm/mach-msm/board-msm7x27a.c
+++ b/arch/arm/mach-msm/board-msm7x27a.c
@@ -49,7 +49,7 @@
#include "timer.h"
#include "board-msm7x27a-regulator.h"
#include "devices-msm7x2xa.h"
-#include "pm.h"
+#include <mach/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 a3f9ccd..bd570cf 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 "pm.h"
+#include <mach/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 11b70ee..8f9b3f8 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -88,8 +88,8 @@
#include "devices.h"
#include "devices-msm8x60.h"
-#include "cpuidle.h"
-#include "pm.h"
+#include <mach/cpuidle.h>
+#include <mach/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 8a7fe5b..594a084 100644
--- a/arch/arm/mach-msm/board-qrd7627a.c
+++ b/arch/arm/mach-msm/board-qrd7627a.c
@@ -48,7 +48,7 @@
#include "board-msm7x27a-regulator.h"
#include "devices.h"
#include "devices-msm7x2xa.h"
-#include "pm.h"
+#include <mach/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 5a77333..65aaa9a 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 "pm.h"
+#include <mach/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 6738955..abaa925 100644
--- a/arch/arm/mach-msm/cpuidle.c
+++ b/arch/arm/mach-msm/cpuidle.c
@@ -16,8 +16,8 @@
#include <linux/cpuidle.h>
#include <linux/cpu_pm.h>
-#include "cpuidle.h"
-#include "pm.h"
+#include <mach/cpuidle.h>
+#include <mach/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 b3541d5..0c46c9d 100644
--- a/arch/arm/mach-msm/devices-9615.c
+++ b/arch/arm/mach-msm/devices-9615.c
@@ -33,7 +33,7 @@
#include "devices.h"
#include "mpm.h"
#include "spm.h"
-#include "pm.h"
+#include <mach/pm.h>
#include "rpm_resources.h"
#include "msm_watchdog.h"
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index 4f32a29..743e3de 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -13,9 +13,10 @@
#include <asm/cacheflush.h>
#include <asm/vfp.h>
+#include <mach/pm.h>
+
#include "qdss.h"
#include "spm.h"
-#include "pm.h"
extern volatile int pen_release;
diff --git a/arch/arm/mach-msm/idle_stats.c b/arch/arm/mach-msm/idle_stats.c
index 6f80e32..f4d3a27 100644
--- a/arch/arm/mach-msm/idle_stats.c
+++ b/arch/arm/mach-msm/idle_stats.c
@@ -27,7 +27,7 @@
#include <asm/uaccess.h>
#include "idle_stats.h"
-#include "cpuidle.h"
+#include <mach/cpuidle.h>
/******************************************************************************
* Debug Definitions
diff --git a/arch/arm/mach-msm/cpuidle.h b/arch/arm/mach-msm/include/mach/cpuidle.h
similarity index 98%
rename from arch/arm/mach-msm/cpuidle.h
rename to arch/arm/mach-msm/include/mach/cpuidle.h
index 37b8d00..b0aa902 100644
--- a/arch/arm/mach-msm/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 "pm.h"
+#include <mach/pm.h>
struct msm_cpuidle_state {
unsigned int cpu;
diff --git a/arch/arm/mach-msm/pm.h b/arch/arm/mach-msm/include/mach/pm.h
similarity index 100%
rename from arch/arm/mach-msm/pm.h
rename to arch/arm/mach-msm/include/mach/pm.h
diff --git a/arch/arm/mach-msm/no-pm.c b/arch/arm/mach-msm/no-pm.c
index 366b282..f51286f 100644
--- a/arch/arm/mach-msm/no-pm.c
+++ b/arch/arm/mach-msm/no-pm.c
@@ -13,9 +13,9 @@
#include <linux/module.h>
-#include "cpuidle.h"
+#include <mach/cpuidle.h>
#include "idle.h"
-#include "pm.h"
+#include <mach/pm.h>
void arch_idle(void)
{ }
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 8085b82..d73d4a0 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 "pm.h"
+#include <mach/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 adf5471..a6644d6 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -41,9 +41,9 @@
#include "acpuclock.h"
#include "clock.h"
#include "avs.h"
-#include "cpuidle.h"
+#include <mach/cpuidle.h>
#include "idle.h"
-#include "pm.h"
+#include <mach/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 d684a5a..3dcbfb3 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 "pm.h"
+#include <mach/pm.h>
#include "pm-boot.h"
enum {
diff --git a/arch/arm/mach-msm/pm2.c b/arch/arm/mach-msm/pm2.c
index 4cdd7ae..0518ea2 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 "pm.h"
+#include <mach/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 572fb34..e849208 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 "pm.h"
+#include <mach/pm.h>
struct msm_rpmrs_limits {