From 139237c9f097abf8768c05d6b0fd320ddb18eb33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 15 Mar 2017 09:06:19 +0100 Subject: [PATCH] cmd: pmic: use pmic_reg_write()/pmic_reg_read() functions --- cmd/pmic.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/cmd/pmic.c b/cmd/pmic.c index 92c8dcee25..2b1072f220 100644 --- a/cmd/pmic.c +++ b/cmd/pmic.c @@ -77,7 +77,6 @@ static int do_list(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { struct udevice *dev; - uint8_t value; uint reg; int ret; @@ -91,9 +90,9 @@ static int do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("Dump pmic: %s registers\n", dev->name); for (reg = 0; reg < pmic_reg_count(dev); reg++) { - ret = pmic_read(dev, reg, &value, 1); - if (ret) { - printf("Can't read register: %d\n", reg); + ret = pmic_reg_read(dev, reg); + if (ret < 0) { + printf("Can't read register: %04x!\n", reg); return failure(ret); } @@ -111,7 +110,6 @@ static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { struct udevice *dev; int regs, ret; - uint8_t value; uint reg; if (!currdev) { @@ -131,9 +129,9 @@ static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return failure(-EFAULT); } - ret = pmic_read(dev, reg, &value, 1); - if (ret) { - printf("Can't read PMIC register: %d!\n", reg); + ret = pmic_reg_read(dev, reg); + if (ret < 0) { + printf("Can't read PMIC register: %0x4!\n", reg); return failure(ret); } @@ -146,7 +144,7 @@ static int do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { struct udevice *dev; int regs, ret; - uint8_t value; + uint value; uint reg; if (!currdev) { @@ -167,10 +165,13 @@ static int do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } value = simple_strtoul(argv[2], NULL, 16); - - ret = pmic_write(dev, reg, &value, 1); - if (ret) { - printf("Can't write PMIC register: %d!\n", reg); + if (value > 255) { + printf("ERROR: value 0x%x out of range [0x00..0xff]\n", value); + return failure(-EINVAL); + } + ret = pmic_reg_write(dev, reg, value); + if (ret < 0) { + printf("Can't write PMIC register: %04x!\n", reg); return failure(ret); } -- 2.39.5