| Message ID | 63F28649326B5F45BF5E97E219B550810340804A85@lhq-exchange.linn.co.uk |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
Dear 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 <stathis.voukelatos@linn.co.uk> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Marek Vasut <marek.vasut@gmail.com> [...] Acked-by: Marek Vasut <marex@denx.de> Stefano, can you please apply? Best regards, Marek Vasut
On 27/07/2012 10:53, Stathis Voukelatos wrote: > 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 <stathis.voukelatos@linn.co.uk> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Marek Vasut <marek.vasut@gmail.com> > --- > 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
On 07/08/2012 16:56, Stathis Voukelatos wrote: > Signed-off-by: Stathis Voukelatos <stathis.voukelatos@linn.co.uk> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Marek Vasut <marek.vasut@gmail.com> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git arch/arm/cpu/arm926ejs/mx28/spl_power_init.c arch/arm/cpu/arm926ejs/mx28/spl_power_init.c index 4b09b0c..cc71af8 100644 --- arch/arm/cpu/arm926ejs/mx28/spl_power_init.c +++ arch/arm/cpu/arm926ejs/mx28/spl_power_init.c @@ -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)
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 <stathis.voukelatos@linn.co.uk> Cc: Stefano Babic <sbabic@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> --- Changes for v2: - White space cleanup arch/arm/cpu/arm926ejs/mx28/spl_power_init.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) } 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@linn.co.uk