| Message ID | 1432207218-7717-1-git-send-email-stefan.wahren@i2se.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On Thursday, May 21, 2015 at 01:20:17 PM, Stefan Wahren wrote: > In case the DC-DC is already enabled mxs_enable_4p2_dcdc_input() returns > without reenabling brown out detection. So fix this issue by > moving the return before brown out deactivation. > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Marek Vasut <marex@denx.de> Best regards, Marek Vasut
On 21/05/2015 13:20, Stefan Wahren wrote: > In case the DC-DC is already enabled mxs_enable_4p2_dcdc_input() returns > without reenabling brown out detection. So fix this issue by > moving the return before brown out deactivation. > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > --- > arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c > index c342217..42f3df2 100644 > --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c > +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c > @@ -332,6 +332,11 @@ static void mxs_enable_4p2_dcdc_input(int xfer) > > debug("SPL: %s 4P2 DC-DC Input\n", xfer ? "Enabling" : "Disabling"); > > + if (xfer && (readl(&power_regs->hw_power_5vctrl) & > + POWER_5VCTRL_ENABLE_DCDC)) { > + return; > + } > + > prev_5v_brnout = readl(&power_regs->hw_power_5vctrl) & > POWER_5VCTRL_PWDN_5VBRNOUT; > prev_5v_droop = readl(&power_regs->hw_power_ctrl) & > @@ -343,11 +348,6 @@ static void mxs_enable_4p2_dcdc_input(int xfer) > > clrbits_le32(&power_regs->hw_power_ctrl, POWER_CTRL_ENIRQ_VDD5V_DROOP); > > - if (xfer && (readl(&power_regs->hw_power_5vctrl) & > - POWER_5VCTRL_ENABLE_DCDC)) { > - return; > - } > - > /* > * Recording orignal values that will be modified temporarlily > * to handle a chip bug. See chip errata for CQ ENGR00115837 > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index c342217..42f3df2 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -332,6 +332,11 @@ static void mxs_enable_4p2_dcdc_input(int xfer) debug("SPL: %s 4P2 DC-DC Input\n", xfer ? "Enabling" : "Disabling"); + if (xfer && (readl(&power_regs->hw_power_5vctrl) & + POWER_5VCTRL_ENABLE_DCDC)) { + return; + } + prev_5v_brnout = readl(&power_regs->hw_power_5vctrl) & POWER_5VCTRL_PWDN_5VBRNOUT; prev_5v_droop = readl(&power_regs->hw_power_ctrl) & @@ -343,11 +348,6 @@ static void mxs_enable_4p2_dcdc_input(int xfer) clrbits_le32(&power_regs->hw_power_ctrl, POWER_CTRL_ENIRQ_VDD5V_DROOP); - if (xfer && (readl(&power_regs->hw_power_5vctrl) & - POWER_5VCTRL_ENABLE_DCDC)) { - return; - } - /* * Recording orignal values that will be modified temporarlily * to handle a chip bug. See chip errata for CQ ENGR00115837
In case the DC-DC is already enabled mxs_enable_4p2_dcdc_input() returns without reenabling brown out detection. So fix this issue by moving the return before brown out deactivation. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> --- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)