Merge "msm: Add RPM stats read support for 8960." into msm-3.0
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 66d1044..a17c476 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1587,6 +1587,7 @@
config MSM_RPM_LOG
tristate "MSM Resource Power Manager Log Driver"
depends on DEBUG_FS
+ depends on MSM_RPM
default n
help
This option enables a driver which can read from a circular buffer
@@ -1597,7 +1598,7 @@
config MSM_RPM_STATS_LOG
tristate "MSM Resource Power Manager Stat Driver"
depends on DEBUG_FS
- depends on ARCH_MSM8X60
+ depends on MSM_RPM
default n
help
This option enables a driver which reads RPM messages from a shared
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 7448cc6..8350139 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -3773,6 +3773,7 @@
&ion_dev,
#endif
&msm_rpm_log_device,
+ &msm_rpm_stat_device,
#ifdef CONFIG_MSM_QDSS
&msm_etb_device,
&msm_tpiu_device,
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 4e047c5..2d2f104 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -36,6 +36,7 @@
#include "devices-msm8x60.h"
#include "footswitch.h"
#include "msm_watchdog.h"
+#include "rpm_stats.h"
#ifdef CONFIG_MSM_MPM
#include "mpm.h"
@@ -2245,6 +2246,18 @@
.id = -1,
};
+static struct msm_rpmstats_platform_data msm_rpm_stat_pdata = {
+ .phys_addr_base = 0x0010D204,
+ .phys_size = SZ_8K,
+};
+
+struct platform_device msm_rpm_stat_device = {
+ .name = "msm_rpm_stat",
+ .id = -1,
+ .dev = {
+ .platform_data = &msm_rpm_stat_pdata,
+ },
+};
struct platform_device msm_bus_sys_fabric = {
.name = "msm_bus_fabric",
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index c490574..4af3e68 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -191,6 +191,7 @@
extern struct platform_device ion_dev;
extern struct platform_device msm_rpm_device;
+extern struct platform_device msm_rpm_stat_device;
extern struct platform_device msm_device_rng;
#if defined(CONFIG_CRYPTO_DEV_QCRYPTO) || \