msm: rpm: Remove RPM stubs that returned success for 8064
RPM APIs were stubbed out during initial bringup of 8064 when RPM wasn't
available on the Virtio model. The patch also initiliazes the L2 rpm
resources callback funciton for 8064.
Change-Id: I7a9a4ea58a83a9b3d4ba5308e3de16def545c6d7
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
diff --git a/arch/arm/mach-msm/rpm.c b/arch/arm/mach-msm/rpm.c
index fb9d295..05b2953 100644
--- a/arch/arm/mach-msm/rpm.c
+++ b/arch/arm/mach-msm/rpm.c
@@ -31,7 +31,6 @@
#include <asm/hardware/gic.h>
#include <mach/msm_iomap.h>
#include <mach/rpm.h>
-#include <mach/socinfo.h>
/******************************************************************************
* Data type and structure definitions
@@ -425,9 +424,6 @@
uint32_t sel_masks[SEL_MASK_SIZE] = {};
int rc;
- if (cpu_is_apq8064())
- return 0;
-
if (ctx >= MSM_RPM_CTX_SET_COUNT) {
rc = -EINVAL;
goto set_common_exit;
@@ -471,9 +467,6 @@
int rc;
int i;
- if (cpu_is_apq8064())
- return 0;
-
if (ctx >= MSM_RPM_CTX_SET_COUNT) {
rc = -EINVAL;
goto clear_common_exit;
@@ -612,9 +605,6 @@
int rc;
int i;
- if (cpu_is_apq8064())
- return 0;
-
seq_begin = msm_rpm_read(MSM_RPM_PAGE_STATUS,
target_status(MSM_RPM_STATUS_ID_SEQUENCE));
@@ -768,9 +758,6 @@
int rc;
int i;
- if (cpu_is_apq8064())
- return 0;
-
INIT_LIST_HEAD(&n->list);
rc = msm_rpm_fill_sel_masks(n->sel_masks, req, count);
if (rc)
@@ -823,9 +810,6 @@
int rc;
int i;
- if (cpu_is_apq8064())
- return 0;
-
rc = mutex_lock_interruptible(&msm_rpm_mutex);
if (rc)
goto unregister_notification_exit;
@@ -951,9 +935,6 @@
unsigned int irq;
int rc;
- if (cpu_is_apq8064())
- return 0;
-
memcpy(&msm_rpm_data, data, sizeof(struct msm_rpm_platform_data));
msm_rpm_sel_mask_size = msm_rpm_data.sel_last / 32 + 1;
BUG_ON(SEL_MASK_SIZE < msm_rpm_sel_mask_size);
diff --git a/arch/arm/mach-msm/rpm_resources.c b/arch/arm/mach-msm/rpm_resources.c
index b4c7f29..546a917 100644
--- a/arch/arm/mach-msm/rpm_resources.c
+++ b/arch/arm/mach-msm/rpm_resources.c
@@ -1033,9 +1033,6 @@
struct msm_rpm_iv_pair req;
int rc;
- if (cpu_is_apq8064())
- return -ENODEV;
-
BUG_ON(!msm_rpmrs_levels);
if (cpu_is_msm8x60()) {
@@ -1069,7 +1066,7 @@
static int __init msm_rpmrs_l2_init(void)
{
- if (cpu_is_msm8960() || cpu_is_msm8930()) {
+ if (cpu_is_msm8960() || cpu_is_msm8930() || cpu_is_apq8064()) {
msm_pm_set_l2_flush_flag(0);