Browse Source

ARM: vexpress/TC2: Convert OPP voltage to uV before storing

The SPC stores voltage in mV while the code assumes it was returning
uV. Convert the returned voltage to uV before storing. Also fix the
comment depicting voltage to uV.

Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Punit Agrawal 11 years ago
parent
commit
cf2e0a73ca
1 changed files with 2 additions and 2 deletions
  1. 2 2
      arch/arm/mach-vexpress/spc.c

+ 2 - 2
arch/arm/mach-vexpress/spc.c

@@ -392,7 +392,7 @@ static irqreturn_t ve_spc_irq_handler(int irq, void *data)
  *  +--------------------------+
  *  +--------------------------+
  *  | 31      20 | 19        0 |
  *  | 31      20 | 19        0 |
  *  +--------------------------+
  *  +--------------------------+
- *  |   u_volt   |  freq(kHz)  |
+ *  |   m_volt   |  freq(kHz)  |
  *  +--------------------------+
  *  +--------------------------+
  */
  */
 #define MULT_FACTOR	20
 #define MULT_FACTOR	20
@@ -414,7 +414,7 @@ static int ve_spc_populate_opps(uint32_t cluster)
 		ret = ve_spc_read_sys_cfg(SYSCFG_SCC, off, &data);
 		ret = ve_spc_read_sys_cfg(SYSCFG_SCC, off, &data);
 		if (!ret) {
 		if (!ret) {
 			opps->freq = (data & FREQ_MASK) * MULT_FACTOR;
 			opps->freq = (data & FREQ_MASK) * MULT_FACTOR;
-			opps->u_volt = data >> VOLT_SHIFT;
+			opps->u_volt = (data >> VOLT_SHIFT) * 1000;
 		} else {
 		} else {
 			break;
 			break;
 		}
 		}