i.MX28: bug fixes in PMU configuration code

PATCH New Stathis Voukelatos 4 participants 6 messages Jul 27, 2012 – Aug 7, 2012 Arm (32-bit)

Share & tools

Stathis Voukelatos

author

2012-07-27 08:53 UTC #0 lore raw

PATCH v2 1/1 i.MX28: bug fixes in PMU configuration code

Fixed some typos in the i.MX28 PMU code that sets up the VDDD and VDDIO power rails. In addition the VDDD and VDDIO brownout offset values should be divided by a step size before being programmed to the corresponding registers.

Signed-off-by Stathis Voukelatos <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Marek Vasut <[email protected]>

---

Changes for v2:
- White space cleanup

 arch/arm/cpu/arm926ejs/mx28/spl_power_init.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

arm/cpu/arm926ejs/mx28/spl_power_init.c +3 -3

index 4b09b0c..cc71af8 100644
@@ -716,7 +716,7 @@ int mx28_get_vddio_power_source_off(void)
 		tmp = readl(&power_regs->hw_power_vddioctrl);
 		if (tmp & POWER_VDDIOCTRL_DISABLE_FET) {
 			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
-				POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
+				POWER_VDDIOCTRL_LINREG_OFFSET_0STEPS) {
 				return 1;
 			}
 		}

@@ -724,7 +724,7 @@ int mx28_get_vddio_power_source_off(void)
 		if (!(readl(&power_regs->hw_power_5vctrl) &
 			POWER_5VCTRL_ENABLE_DCDC)) {
 			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
-				POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
+				POWER_VDDIOCTRL_LINREG_OFFSET_0STEPS) {
 				return 1;
 			}
 		}

@@ -772,7 +772,7 @@ void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout)
 	uint32_t cur_target, diff, bo_int = 0;
 	uint32_t powered_by_linreg = 0;
 
-	new_brownout = new_target - new_brownout;
+	new_brownout = (new_target - new_brownout + 25) / 50;
 
 	cur_target = readl(&power_regs->hw_power_vddioctrl);
 	cur_target &= POWER_VDDIOCTRL_TRG_MASK; @@ -858,8 +858,8 @@ void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout)

}

clrsetbits_le32(&power_regs->hw_power_vddioctrl,
- POWER_VDDDCTRL_BO_OFFSET_MASK,
- new_brownout << POWER_VDDDCTRL_BO_OFFSET_OFFSET);
+ POWER_VDDIOCTRL_BO_OFFSET_MASK,
+ new_brownout << POWER_VDDIOCTRL_BO_OFFSET_OFFSET);
}

void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout) @@ -869,7 +869,7 @@ void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout)
uint32_t cur_target, diff, bo_int = 0;
uint32_t powered_by_linreg = 0;

- new_brownout = new_target - new_brownout;
+ new_brownout = (new_target - new_brownout + 12) / 25;

cur_target = readl(&power_regs->hw_power_vdddctrl); cur_target &= POWER_VDDDCTRL_TRG_MASK;
--
1.7.2.5

Stathis Voukelatos
Senior Software Engineer
Linn Products Ltd.
Glasgow Road
Eaglesham, Glasgow
G76 0EQ, UK
Tel: +44 (0)141 3035191
Email: stathis.voukelatos at linn.co.uk

Marek Vasut

2012-07-27 14:18 UTC #1 lore raw

PATCH v2 1/1 i.MX28: bug fixes in PMU configuration code

Dear Stathis Voukelatos,

Quoted 8 lines

Fixed some typos in the i.MX28 PMU code that sets up the VDDD and VDDIO power rails. In addition the VDDD and VDDIO brownout offset values should be divided by a step size before being programmed to the corresponding registers.
Signed-off-by Stathis Voukelatos <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>

[...]

Acked-by Marek Vasut <[email protected]>

Stefano, can you please apply?

Best regards,
Marek Vasut

Stefano Babic

2012-07-29 10:13 UTC #2 lore raw

PATCH v2 1/1 i.MX28: bug fixes in PMU configuration code

In reply to Stathis Voukelatos

Quoted 7 lines · Stathis Voukelatos

Fixed some typos in the i.MX28 PMU code that sets up the VDDD and VDDIO power rails. In addition the VDDD and VDDIO brownout offset values should be divided by a step size before being programmed to the corresponding registers.
Signed-off-by Stathis Voukelatos <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>
---

Hi Stathis,

your patch looks ok but it is mangled by your e-mailer. See how patchwork shows your patch at:

	http://patchwork.ozlabs.org/patch/173592/

Part of your patch is moved into the comments and some characters are replaced.

Your patch is surely ok because you use git-format-patch. Can you check this issue and resend it, possibly using git send-email that avoids these kind of problems ? Thanks !

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Stathis Voukelatos

2012-08-07 14:56 UTC #3 lore raw

PATCH RESEND v2 1/1 i.MX28: bug fixes in PMU configuration code

Signed-off-by Stathis Voukelatos <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Marek Vasut <[email protected]>

---

Changes for v2:
- White space cleanup

 arch/arm/cpu/arm926ejs/mx28/spl_power_init.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

arch/arm/cpu/arm926ejs/mx28/spl_power_init.c +6 -6

index 4b09b0c..cc71af8 100644
@@ -716,7 +716,7 @@ int mx28_get_vddio_power_source_off(void)
 		tmp = readl(&power_regs->hw_power_vddioctrl);
 		if (tmp & POWER_VDDIOCTRL_DISABLE_FET) {
 			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
-				POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
+				POWER_VDDIOCTRL_LINREG_OFFSET_0STEPS) {
 				return 1;
 			}
 		}

@@ -724,7 +724,7 @@ int mx28_get_vddio_power_source_off(void)
 		if (!(readl(&power_regs->hw_power_5vctrl) &
 			POWER_5VCTRL_ENABLE_DCDC)) {
 			if ((tmp & POWER_VDDIOCTRL_LINREG_OFFSET_MASK) ==
-				POWER_VDDDCTRL_LINREG_OFFSET_0STEPS) {
+				POWER_VDDIOCTRL_LINREG_OFFSET_0STEPS) {
 				return 1;
 			}
 		}

@@ -772,7 +772,7 @@ void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout)
 	uint32_t cur_target, diff, bo_int = 0;
 	uint32_t powered_by_linreg = 0;
 
-	new_brownout = new_target - new_brownout;
+	new_brownout = (new_target - new_brownout + 25) / 50;
 
 	cur_target = readl(&power_regs->hw_power_vddioctrl);
 	cur_target &= POWER_VDDIOCTRL_TRG_MASK;

@@ -858,8 +858,8 @@ void mx28_power_set_vddio(uint32_t new_target, uint32_t new_brownout)
 	}
 
 	clrsetbits_le32(&power_regs->hw_power_vddioctrl,
-			POWER_VDDDCTRL_BO_OFFSET_MASK,
-			new_brownout << POWER_VDDDCTRL_BO_OFFSET_OFFSET);
+			POWER_VDDIOCTRL_BO_OFFSET_MASK,
+			new_brownout << POWER_VDDIOCTRL_BO_OFFSET_OFFSET);
 }
 
 void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout)

@@ -869,7 +869,7 @@ void mx28_power_set_vddd(uint32_t new_target, uint32_t new_brownout)
 	uint32_t cur_target, diff, bo_int = 0;
 	uint32_t powered_by_linreg = 0;
 
-	new_brownout = new_target - new_brownout;
+	new_brownout = (new_target - new_brownout + 12) / 25;
 
 	cur_target = readl(&power_regs->hw_power_vdddctrl);
 	cur_target &= POWER_VDDDCTRL_TRG_MASK;

Signature · 1 line

1.7.2.5

Stefano Babic

2012-08-07 15:47 UTC #4 lore raw

PATCH RESEND v2 1/1 i.MX28: bug fixes in PMU configuration code

Quoted 4 lines · Stathis Voukelatos

Signed-off-by Stathis Voukelatos <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>
---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

Marek Vasut

2012-08-07 19:15 UTC #5 lore raw

PATCH RESEND v2 1/1 i.MX28: bug fixes in PMU configuration code

In reply to Stathis Voukelatos

Dear Stathis Voukelatos,

Quoted 4 lines

Signed-off-by Stathis Voukelatos <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Marek Vasut <[email protected]>
---

Thanks for the patch and your effort !

btw. how did you find it ? :)

Best regards,
Marek Vasut