diff options
| author | Tom Rini <trini@ti.com> | 2014-07-02 16:38:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-02 16:38:02 -0400 |
| commit | fe8b3212b7938861eacdefe6115810303a96f9cc (patch) | |
| tree | 281508c9caa5a969597a4dff58d3027337b8759c /drivers/power/pmic/pmic_max77686.c | |
| parent | a176ff0705351bf6d993a8f15e081bfa2ba2e1af (diff) | |
| parent | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (diff) | |
| download | u-boot-imx-fe8b3212b7938861eacdefe6115810303a96f9cc.zip u-boot-imx-fe8b3212b7938861eacdefe6115810303a96f9cc.tar.gz u-boot-imx-fe8b3212b7938861eacdefe6115810303a96f9cc.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/power/pmic/pmic_max77686.c')
| -rw-r--r-- | drivers/power/pmic/pmic_max77686.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/power/pmic/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c index d4c430e..df1fd91 100644 --- a/drivers/power/pmic/pmic_max77686.c +++ b/drivers/power/pmic/pmic_max77686.c @@ -210,6 +210,10 @@ int pmic_init(unsigned char bus) { static const char name[] = "MAX77686_PMIC"; struct pmic *p = pmic_alloc(); +#ifdef CONFIG_OF_CONTROL + const void *blob = gd->fdt_blob; + int node, parent, tmp; +#endif if (!p) { printf("%s: POWER allocation error!\n", __func__); @@ -217,9 +221,6 @@ int pmic_init(unsigned char bus) } #ifdef CONFIG_OF_CONTROL - const void *blob = gd->fdt_blob; - int node, parent; - node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC); if (node < 0) { debug("PMIC: No node for PMIC Chip in device tree\n"); @@ -233,11 +234,13 @@ int pmic_init(unsigned char bus) return -1; } - p->bus = i2c_get_bus_num_fdt(parent); - if (p->bus < 0) { + /* tmp since p->bus is unsigned */ + tmp = i2c_get_bus_num_fdt(parent); + if (tmp < 0) { debug("%s: Cannot find I2C bus\n", __func__); return -1; } + p->bus = tmp; p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9); #else p->bus = bus; |