msm: clock-rpm: Store the RPM clock resource keys in the rpm_clk struct
RPM clocks may have key-value pairs with differing keys.
For example, rate-settable RPM clocks have 'KHz' as a key,
and branch clocks have 'Enab' as a key. To accomodate for
this, store the relevant key in the rpm_clk structure
and pass the key in via the clock defining macros.
Change-Id: I0dc051410e161d1c3f8199d9b17e4983a55185f3
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 8096c10..43d5228 100644
--- a/arch/arm/mach-msm/clock-rpm.c
+++ b/arch/arm/mach-msm/clock-rpm.c
@@ -60,9 +60,8 @@
static int clk_rpmrs_set_rate_smd(struct rpm_clk *r, uint32_t value,
uint32_t context, int noirq)
{
- u32 rpm_key = r->branch ? RPM_SMD_KEY_ENABLE : RPM_SMD_KEY_RATE;
struct msm_rpm_kvp kvp = {
- .key = rpm_key,
+ .key = r->rpm_key,
.data = (void *)&value,
.length = sizeof(value),
};