msm: clock-rpm: Add support for the new RPM SMD API.
Starting with the MSM Copper, the RPM driver has a new
communication method with the RPM that uses SMD as its
transport layer. Add support for the new RPM APIs.
Change-Id: I63413984db8ecd262abcfa4065f9852dce646a7f
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-rpm.c b/arch/arm/mach-msm/clock-rpm.c
index 616dcdc..e0707fc 100644
--- a/arch/arm/mach-msm/clock-rpm.c
+++ b/arch/arm/mach-msm/clock-rpm.c
@@ -54,6 +54,25 @@
return (rc < 0) ? rc : iv.value * 1000;
}
+#define RPM_SMD_KEY_CLOCK_SET_RATE 0x007A484B
+
+static int clk_rpmrs_set_rate_smd(struct rpm_clk *r, uint32_t value,
+ uint32_t context, int noirq)
+{
+ struct msm_rpm_kvp kvp = {
+ .key = RPM_SMD_KEY_CLOCK_SET_RATE,
+ .data = (void *)&value,
+ .length = sizeof(value),
+ };
+
+ if (noirq)
+ return msm_rpm_send_message_noirq(context,
+ r->rpm_res_type, r->rpm_clk_id, &kvp, 1);
+ else
+ return msm_rpm_send_message(context, r->rpm_res_type,
+ r->rpm_clk_id, &kvp, 1);
+}
+
struct clk_rpmrs_data {
int (*set_rate_fn)(struct rpm_clk *r, uint32_t value,
uint32_t context, int noirq);
@@ -69,6 +88,12 @@
.ctx_sleep_id = MSM_RPM_CTX_SET_SLEEP,
};
+struct clk_rpmrs_data clk_rpmrs_data_smd = {
+ .set_rate_fn = clk_rpmrs_set_rate_smd,
+ .ctx_active_id = MSM_RPM_CTX_ACTIVE_SET,
+ .ctx_sleep_id = MSM_RPM_CTX_SLEEP_SET,
+};
+
static DEFINE_SPINLOCK(rpm_clock_lock);
static int rpm_clk_enable(struct clk *clk)
diff --git a/arch/arm/mach-msm/clock-rpm.h b/arch/arm/mach-msm/clock-rpm.h
index 35b36ae..b2358bc 100644
--- a/arch/arm/mach-msm/clock-rpm.h
+++ b/arch/arm/mach-msm/clock-rpm.h
@@ -15,6 +15,7 @@
#define __ARCH_ARM_MACH_MSM_CLOCK_RPM_H
#include <mach/rpm.h>
+#include <mach/rpm-smd.h>
struct clk_ops;
struct clk_rpmrs_data;
@@ -22,6 +23,7 @@
extern struct clk_ops clk_ops_rpm_branch;
struct rpm_clk {
+ const int rpm_res_type;
const int rpm_clk_id;
const int rpm_status_id;
const bool active_only;
@@ -42,14 +44,16 @@
}
extern struct clk_rpmrs_data clk_rpmrs_data;
+extern struct clk_rpmrs_data clk_rpmrs_data_smd;
-#define DEFINE_CLK_RPM(name, active, r_id, dep) \
+#define __DEFINE_CLK_RPM(name, active, type, r_id, stat_id, dep, rpmrsdata) \
static struct rpm_clk active; \
static struct rpm_clk name = { \
- .rpm_clk_id = MSM_RPM_ID_##r_id##_CLK, \
- .rpm_status_id = MSM_RPM_STATUS_ID_##r_id##_CLK, \
+ .rpm_res_type = (type), \
+ .rpm_clk_id = (r_id), \
+ .rpm_status_id = (stat_id), \
.peer = &active, \
- .rpmrs_data = &clk_rpmrs_data,\
+ .rpmrs_data = (rpmrsdata),\
.c = { \
.ops = &clk_ops_rpm, \
.flags = CLKFLAG_SKIP_AUTO_OFF, \
@@ -59,11 +63,12 @@
}, \
}; \
static struct rpm_clk active = { \
- .rpm_clk_id = MSM_RPM_ID_##r_id##_CLK, \
- .rpm_status_id = MSM_RPM_STATUS_ID_##r_id##_CLK, \
+ .rpm_res_type = (type), \
+ .rpm_clk_id = (r_id), \
+ .rpm_status_id = (stat_id), \
.peer = &name, \
.active_only = true, \
- .rpmrs_data = &clk_rpmrs_data,\
+ .rpmrs_data = (rpmrsdata),\
.c = { \
.ops = &clk_ops_rpm, \
.flags = CLKFLAG_SKIP_AUTO_OFF, \
@@ -73,16 +78,18 @@
}, \
};
-#define DEFINE_CLK_RPM_BRANCH(name, active, r_id, r) \
+#define __DEFINE_CLK_RPM_BRANCH(name, active, type, r_id, stat_id, r, \
+ rpmrsdata) \
static struct rpm_clk active; \
static struct rpm_clk name = { \
- .rpm_clk_id = MSM_RPM_ID_##r_id##_CLK, \
- .rpm_status_id = MSM_RPM_STATUS_ID_##r_id##_CLK, \
+ .rpm_res_type = (type), \
+ .rpm_clk_id = (r_id), \
+ .rpm_status_id = (stat_id), \
.peer = &active, \
.last_set_khz = ((r) / 1000), \
.last_set_sleep_khz = ((r) / 1000), \
.branch = true, \
- .rpmrs_data = &clk_rpmrs_data,\
+ .rpmrs_data = (rpmrsdata),\
.c = { \
.ops = &clk_ops_rpm_branch, \
.flags = CLKFLAG_SKIP_AUTO_OFF, \
@@ -93,13 +100,14 @@
}, \
}; \
static struct rpm_clk active = { \
- .rpm_clk_id = MSM_RPM_ID_##r_id##_CLK, \
- .rpm_status_id = MSM_RPM_STATUS_ID_##r_id##_CLK, \
+ .rpm_res_type = (type), \
+ .rpm_clk_id = (r_id), \
+ .rpm_status_id = (stat_id), \
.peer = &name, \
.last_set_khz = ((r) / 1000), \
.active_only = true, \
.branch = true, \
- .rpmrs_data = &clk_rpmrs_data,\
+ .rpmrs_data = (rpmrsdata),\
.c = { \
.ops = &clk_ops_rpm_branch, \
.flags = CLKFLAG_SKIP_AUTO_OFF, \
@@ -110,4 +118,19 @@
}, \
};
+#define DEFINE_CLK_RPM(name, active, r_id, dep) \
+ __DEFINE_CLK_RPM(name, active, 0, MSM_RPM_ID_##r_id##_CLK, \
+ MSM_RPM_STATUS_ID_##r_id##_CLK, dep, &clk_rpmrs_data)
+
+#define DEFINE_CLK_RPM_BRANCH(name, active, r_id, r) \
+ __DEFINE_CLK_RPM_BRANCH(name, active, 0, MSM_RPM_ID_##r_id##_CLK, \
+ MSM_RPM_STATUS_ID_##r_id##_CLK, r, &clk_rpmrs_data)
+
+#define DEFINE_CLK_RPM_SMD(name, active, type, r_id, dep) \
+ __DEFINE_CLK_RPM(name, active, type, r_id, 0, dep, &clk_rpmrs_data_smd)
+
+#define DEFINE_CLK_RPM_SMD_BRANCH(name, active, type, r_id, dep) \
+ __DEFINE_CLK_RPM_BRANCH(name, active, type, r_id, 0, dep, \
+ &clk_rpmrs_data_smd)
+
#endif