Patchwork [U-Boot] OMAP4: Fix bug in omap4460_volts struct

login
register
mail settings
Submitter Lubomir Popov
Date April 9, 2013, 8:05 a.m.
Message ID <5163CBCD.3060304@mm-sol.com>
Download mbox | patch
Permalink /patch/234981/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Lubomir Popov - April 9, 2013, 8:05 a.m.
The omap4460_volts struct was incorrectly referencing tps62361
instead of twl6030 as PMIC for the core and mm voltages (the
tps is used for mpu supply only). This shall lead to bad OPP
settings while booting kernel. Fixing it.

Fix some comments as well.

Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>
---
This patch is separated from the OMAP4470/TWL6032 support series
because it fixes an existing bug.

 arch/arm/cpu/armv7/omap4/hw_data.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Tom Rini - April 10, 2013, 8:08 p.m.
On Tue, Apr 09, 2013 at 11:05:33AM +0300, Lubomir Popov wrote:

> The omap4460_volts struct was incorrectly referencing tps62361
> instead of twl6030 as PMIC for the core and mm voltages (the
> tps is used for mpu supply only). This shall lead to bad OPP
> settings while booting kernel. Fixing it.
> 
> Fix some comments as well.
> 
> Signed-off-by: Lubomir Popov <lpopov@mm-sol.com>

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

Patch

diff --git a/arch/arm/cpu/armv7/omap4/hw_data.c b/arch/arm/cpu/armv7/omap4/hw_data.c
index 7551b98..04977b4 100644
--- a/arch/arm/cpu/armv7/omap4/hw_data.c
+++ b/arch/arm/cpu/armv7/omap4/hw_data.c
@@ -216,14 +216,14 @@  struct dplls omap4460_dplls = {
 
 struct pmic_data twl6030_4430es1 = {
 	.base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV,
-	.step = 12660, /* 10 mV represented in uV */
+	.step = 12660, /* 12.66 mV represented in uV */
 	/* The code starts at 1 not 0 */
 	.start_code = 1,
 };
 
 struct pmic_data twl6030 = {
 	.base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV,
-	.step = 12660, /* 10 mV represented in uV */
+	.step = 12660, /* 12.66 mV represented in uV */
 	/* The code starts at 1 not 0 */
 	.start_code = 1,
 };
@@ -271,11 +271,11 @@  struct vcores_data omap4460_volts = {
 
 	.core.value = 1200,
 	.core.addr = SMPS_REG_ADDR_VCORE1,
-	.core.pmic = &tps62361,
+	.core.pmic = &twl6030,
 
 	.mm.value = 1200,
 	.mm.addr = SMPS_REG_ADDR_VCORE2,
-	.mm.pmic = &tps62361,
+	.mm.pmic = &twl6030,
 };
 
 /*