summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-08-12 16:00:50 -0400
committerTom Rini <trini@konsulko.com>2016-08-12 16:00:50 -0400
commitf4b0df1823921ad3bc39820466e9c5201cef6210 (patch)
treefa7ae4f3ac018bc010b7910da55ebb76e3639489 /drivers/power
parentab65006b08c5a2d022b1ce43581e555c82926cd4 (diff)
parentb647f55420310beb8f576e23f3b6a69745126f71 (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/pmic/act8846.c4
-rw-r--r--drivers/power/regulator/act8846.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c
index ff096b3a9c..e8164bfd08 100644
--- a/drivers/power/pmic/act8846.c
+++ b/drivers/power/pmic/act8846.c
@@ -29,7 +29,7 @@ static int act8846_write(struct udevice *dev, uint reg, const uint8_t *buff,
int len)
{
if (dm_i2c_write(dev, reg, buff, len)) {
- debug("write error to device: %p register: %#x!", dev, reg);
+ debug("write error to device: %p register: %#x!\n", dev, reg);
return -EIO;
}
@@ -39,7 +39,7 @@ static int act8846_write(struct udevice *dev, uint reg, const uint8_t *buff,
static int act8846_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
{
if (dm_i2c_read(dev, reg, buff, len)) {
- debug("read error from device: %p register: %#x!", dev, reg);
+ debug("read error from device: %p register: %#x!\n", dev, reg);
return -EIO;
}
diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c
index 255f8b096e..d506165120 100644
--- a/drivers/power/regulator/act8846.c
+++ b/drivers/power/regulator/act8846.c
@@ -88,7 +88,7 @@ static int reg_get_value(struct udevice *dev)
int reg = dev->driver_data;
int ret;
- ret = pmic_reg_read(dev->parent, reg);
+ ret = pmic_reg_read(dev->parent, addr_vol[reg]);
if (ret < 0)
return ret;
@@ -120,7 +120,7 @@ static bool reg_get_enable(struct udevice *dev)
int reg = dev->driver_data;
int ret;
- ret = pmic_reg_read(dev->parent, reg);
+ ret = pmic_reg_read(dev->parent, addr_ctl[reg]);
if (ret < 0)
return ret;