* [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable @ 2012-12-28 14:05 Fabio Estevam 2012-12-28 14:05 ` [U-Boot] [PATCH v2 2/2] mx53loco: Improve error handling on power_init() Fabio Estevam 2013-01-05 17:11 ` [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable Stefano Babic 0 siblings, 2 replies; 4+ messages in thread From: Fabio Estevam @ 2012-12-28 14:05 UTC (permalink / raw) To: u-boot From: Fabio Estevam <fabio.estevam@freescale.com> commit c73368150 (pmic: Extend PMIC framework to support multiple instances of PMIC devices) introduced an extra 'retval' variable, but this is not necessary since we have already the variable 'ret' in place. So use 'ret' to store the return values from the pmic related calls and remove 'retval'. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- Changes since v1: - No changes board/freescale/mx53loco/mx53loco.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index 63a4f8b..b1bfb90 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -345,12 +345,11 @@ static int power_init(void) unsigned int val; int ret = -1; struct pmic *p; - int retval; if (!i2c_probe(CONFIG_SYS_DIALOG_PMIC_I2C_ADDR)) { - retval = pmic_dialog_init(I2C_PMIC); - if (retval) - return retval; + ret = pmic_dialog_init(I2C_PMIC); + if (ret) + return ret; p = pmic_get("DIALOG_PMIC"); if (!p) @@ -370,9 +369,9 @@ static int power_init(void) } if (!i2c_probe(CONFIG_SYS_FSL_PMIC_I2C_ADDR)) { - retval = pmic_init(I2C_PMIC); - if (retval) - return retval; + ret = pmic_init(I2C_PMIC); + if (ret) + return ret; p = pmic_get("FSL_PMIC"); if (!p) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 2/2] mx53loco: Improve error handling on power_init() 2012-12-28 14:05 [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable Fabio Estevam @ 2012-12-28 14:05 ` Fabio Estevam 2013-01-05 17:10 ` Stefano Babic 2013-01-05 17:11 ` [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable Stefano Babic 1 sibling, 1 reply; 4+ messages in thread From: Fabio Estevam @ 2012-12-28 14:05 UTC (permalink / raw) To: u-boot From: Fabio Estevam <fabio.estevam@freescale.com> Make the error handling more robust. Check if each one of the PMIC writes fail and if they do, just return immediately. Also, print the cause for the failures. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- Changes since v2: - Newly introduced here. board/freescale/mx53loco/mx53loco.c | 61 +++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index b1bfb90..60cd4f0 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -343,7 +343,7 @@ static void setup_iomux_i2c(void) static int power_init(void) { unsigned int val; - int ret = -1; + int ret; struct pmic *p; if (!i2c_probe(CONFIG_SYS_DIALOG_PMIC_I2C_ADDR)) { @@ -358,14 +358,33 @@ static int power_init(void) /* Set VDDA to 1.25V */ val = DA9052_BUCKCORE_BCOREEN | DA_BUCKCORE_VBCORE_1_250V; ret = pmic_reg_write(p, DA9053_BUCKCORE_REG, val); + if (ret) { + printf("Writing to BUCKCORE_REG failed: %d\n", ret); + return ret; + } - ret |= pmic_reg_read(p, DA9053_SUPPLY_REG, &val); + pmic_reg_read(p, DA9053_SUPPLY_REG, &val); val |= DA9052_SUPPLY_VBCOREGO; - ret |= pmic_reg_write(p, DA9053_SUPPLY_REG, val); + ret = pmic_reg_write(p, DA9053_SUPPLY_REG, val); + if (ret) { + printf("Writing to SUPPLY_REG failed: %d\n", ret); + return ret; + } /* Set Vcc peripheral to 1.30V */ - ret |= pmic_reg_write(p, DA9053_BUCKPRO_REG, 0x62); - ret |= pmic_reg_write(p, DA9053_SUPPLY_REG, 0x62); + ret = pmic_reg_write(p, DA9053_BUCKPRO_REG, 0x62); + if (ret) { + printf("Writing to BUCKPRO_REG failed: %d\n", ret); + return ret; + } + + ret = pmic_reg_write(p, DA9053_SUPPLY_REG, 0x62); + if (ret) { + printf("Writing to SUPPLY_REG failed: %d\n", ret); + return ret; + } + + return ret; } if (!i2c_probe(CONFIG_SYS_FSL_PMIC_I2C_ADDR)) { @@ -381,28 +400,50 @@ static int power_init(void) pmic_reg_read(p, REG_SW_0, &val); val = (val & ~SWx_VOLT_MASK_MC34708) | SWx_1_250V_MC34708; ret = pmic_reg_write(p, REG_SW_0, val); + if (ret) { + printf("Writing to REG_SW_0 failed: %d\n", ret); + return ret; + } /* Set VCC as 1.30V on SW2 */ pmic_reg_read(p, REG_SW_1, &val); val = (val & ~SWx_VOLT_MASK_MC34708) | SWx_1_300V_MC34708; - ret |= pmic_reg_write(p, REG_SW_1, val); + ret = pmic_reg_write(p, REG_SW_1, val); + if (ret) { + printf("Writing to REG_SW_1 failed: %d\n", ret); + return ret; + } /* Set global reset timer to 4s */ pmic_reg_read(p, REG_POWER_CTL2, &val); val = (val & ~TIMER_MASK_MC34708) | TIMER_4S_MC34708; - ret |= pmic_reg_write(p, REG_POWER_CTL2, val); + ret = pmic_reg_write(p, REG_POWER_CTL2, val); + if (ret) { + printf("Writing to REG_POWER_CTL2 failed: %d\n", ret); + return ret; + } /* Set VUSBSEL and VUSBEN for USB PHY supply*/ pmic_reg_read(p, REG_MODE_0, &val); val |= (VUSBSEL_MC34708 | VUSBEN_MC34708); - ret |= pmic_reg_write(p, REG_MODE_0, val); + ret = pmic_reg_write(p, REG_MODE_0, val); + if (ret) { + printf("Writing to REG_MODE_0 failed: %d\n", ret); + return ret; + } /* Set SWBST to 5V in auto mode */ val = SWBST_AUTO; - ret |= pmic_reg_write(p, SWBST_CTRL, val); + ret = pmic_reg_write(p, SWBST_CTRL, val); + if (ret) { + printf("Writing to SWBST_CTRL failed: %d\n", ret); + return ret; + } + + return ret; } - return ret; + return -1; } static void clock_1GHz(void) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 2/2] mx53loco: Improve error handling on power_init() 2012-12-28 14:05 ` [U-Boot] [PATCH v2 2/2] mx53loco: Improve error handling on power_init() Fabio Estevam @ 2013-01-05 17:10 ` Stefano Babic 0 siblings, 0 replies; 4+ messages in thread From: Stefano Babic @ 2013-01-05 17:10 UTC (permalink / raw) To: u-boot On 28/12/2012 15:05, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Make the error handling more robust. > > Check if each one of the PMIC writes fail and if they do, just return > immediately. > > Also, print the cause for the failures. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== 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 ===================================================================== ^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable 2012-12-28 14:05 [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable Fabio Estevam 2012-12-28 14:05 ` [U-Boot] [PATCH v2 2/2] mx53loco: Improve error handling on power_init() Fabio Estevam @ 2013-01-05 17:11 ` Stefano Babic 1 sibling, 0 replies; 4+ messages in thread From: Stefano Babic @ 2013-01-05 17:11 UTC (permalink / raw) To: u-boot On 28/12/2012 15:05, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > commit c73368150 (pmic: Extend PMIC framework to support multiple instances > of PMIC devices) introduced an extra 'retval' variable, but this is not > necessary since we have already the variable 'ret' in place. > > So use 'ret' to store the return values from the pmic related calls and remove > 'retval'. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== 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 ===================================================================== ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-05 17:11 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-28 14:05 [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable Fabio Estevam 2012-12-28 14:05 ` [U-Boot] [PATCH v2 2/2] mx53loco: Improve error handling on power_init() Fabio Estevam 2013-01-05 17:10 ` Stefano Babic 2013-01-05 17:11 ` [U-Boot] [PATCH v2 1/2] mx53loco: Remove unneeded 'retval' variable Stefano Babic
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.