summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-07-11 11:27:45 +0530
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-05 13:01:53 +0200
commitaa5fa4862a6dfe86f3374cf346451f6e91e90133 (patch)
treeba74cf9758dc54f961e9f2cae8548885e9b2a17a
parent07d8e74ddfeb6e01f9d535d1c2ad17fe0a377d28 (diff)
u5500: fix prcmu_get_arm_opp()
prcmu_set_arm_opp() maps between logical ARM OPP values and PRCMU firmware values, so prcmu_get_arm_opp() should do it too. ST-Ericsson ID: 332226 ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I9b01c2855a333498cba4efdb1dcf8c18db3e21c1 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/26872 Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32507
-rw-r--r--drivers/mfd/db5500-prcmu.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/mfd/db5500-prcmu.c b/drivers/mfd/db5500-prcmu.c
index f4fd91fb47c..3f46e32198f 100644
--- a/drivers/mfd/db5500-prcmu.c
+++ b/drivers/mfd/db5500-prcmu.c
@@ -1048,7 +1048,20 @@ bailout:
*/
int db5500_prcmu_get_arm_opp(void)
{
- return readb(PRCM_ACK_MB1_CURRENT_ARM_OPP);
+ u8 opp = readb(PRCM_ACK_MB1_CURRENT_ARM_OPP);
+
+ switch (opp) {
+ case DB5500_ARM_EXT_OPP:
+ return ARM_EXTCLK;
+ case DB5500_ARM_50_OPP:
+ return ARM_50_OPP;
+ case DB5500_ARM_100_OPP:
+ return ARM_100_OPP;
+ default:
+ pr_err("prcmu: %s() read unknown opp value: %d\n",
+ __func__, opp);
+ return ARM_100_OPP;
+ }
}
int prcmu_resetout(u8 resoutn, u8 state)