diff mbox

[U-Boot] ARM: OMAP4: Fix bug in omap4470_volts struct

Message ID 528CB9E1.3040200@mm-sol.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Lubomir Popov Nov. 20, 2013, 1:32 p.m. UTC
The struct incorrectly referenced SMPS1 for all three power
domains. Fixed this by using SMPS2 and SMPS5 as appropriate.

Add some comments and choose voltage values that correspond
to voltage selection codes.

Signed-off-by: Lubomir Popov <l-popov@ti.com>
---
  arch/arm/cpu/armv7/omap4/hw_data.c |   12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Tom Rini Dec. 4, 2013, 10:04 p.m. UTC | #1
On Wed, Nov 20, 2013 at 03:32:17PM +0200, Lubomir Popov wrote:

> The struct incorrectly referenced SMPS1 for all three power
> domains. Fixed this by using SMPS2 and SMPS5 as appropriate.
> 
> Add some comments and choose voltage values that correspond
> to voltage selection codes.
> 
> Signed-off-by: Lubomir Popov <l-popov@ti.com>

Applied to u-boot-ti/master, thanks!

But I have a follow-up question, should we be using the TWL6032 support
I also just pushed in this case?
Lubomir Popov Dec. 5, 2013, 11:39 a.m. UTC | #2
Hi Tom,

On 05-Dec-13 0:04, Tom Rini wrote:
> On Wed, Nov 20, 2013 at 03:32:17PM +0200, Lubomir Popov wrote:
>
>> The struct incorrectly referenced SMPS1 for all three power
>> domains. Fixed this by using SMPS2 and SMPS5 as appropriate.
>>
>> Add some comments and choose voltage values that correspond
>> to voltage selection codes.
>>
>> Signed-off-by: Lubomir Popov <l-popov@ti.com>
> Applied to u-boot-ti/master, thanks!
>
> But I have a follow-up question, should we be using the TWL6032 support
> I also just pushed in this case?
>
Sorry, but I'm currently unsubscripted from the ML. Could you please
providea link to Oleg's patches so that I can take a look?

Thanks,
Lubo

P.S. Regarding Nikita's fix for OMAP3 I2C, don't you think it should
be applied as well? Or it is up to Heiko?
(http://patchwork.ozlabs.org/patch/294957/)
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/omap4/hw_data.c b/arch/arm/cpu/armv7/omap4/hw_data.c
index 6a225c8..1b2f439 100644
--- a/arch/arm/cpu/armv7/omap4/hw_data.c
+++ b/arch/arm/cpu/armv7/omap4/hw_data.c
@@ -288,17 +288,21 @@  struct vcores_data omap4460_volts = {
      .mm.pmic = &twl6030,
  };

+/*
+ * Take closest integer part of the mV value corresponding to a TWL6032 SMPS
+ * voltage selection code. Aligned with OMAP4470 ES1.0 OCA V.0.7.
+ */
  struct vcores_data omap4470_volts = {
-    .mpu.value = 1200,
+    .mpu.value = 1202,
      .mpu.addr = SMPS_REG_ADDR_SMPS1,
      .mpu.pmic = &twl6030,

      .core.value = 1126,
-    .core.addr = SMPS_REG_ADDR_SMPS1,
+    .core.addr = SMPS_REG_ADDR_SMPS2,
      .core.pmic = &twl6030,

-    .mm.value = 1137,
-    .mm.addr = SMPS_REG_ADDR_SMPS1,
+    .mm.value = 1139,
+    .mm.addr = SMPS_REG_ADDR_SMPS5,
      .mm.pmic = &twl6030,
  };