projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
cmd
/
pmic.c
diff --git
a/cmd/pmic.c
b/cmd/pmic.c
index 7bf23fb2a9f85e67837407871ede5e148d7f89cf..2400bfb601d9d4d931a171aa94fdd047e76093de 100644
(file)
--- a/
cmd/pmic.c
+++ b/
cmd/pmic.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2014-2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
/*
* Copyright (C) 2014-2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <errno.h>
*/
#include <common.h>
#include <errno.h>
@@
-76,8
+75,9
@@
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[])
{
static int do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
+ struct uc_pmic_priv *priv;
struct udevice *dev;
struct udevice *dev;
-
uint8_t value
;
+
char fmt[16]
;
uint reg;
int ret;
uint reg;
int ret;
@@
-87,12
+87,15
@@
static int do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
dev = currdev;
}
dev = currdev;
-
+ priv = dev_get_uclass_priv(dev);
printf("Dump pmic: %s registers\n", dev->name);
printf("Dump pmic: %s registers\n", dev->name);
+ sprintf(fmt, "%%%d.%dx ", priv->trans_len * 2,
+ priv->trans_len * 2);
+
for (reg = 0; reg < pmic_reg_count(dev); reg++) {
for (reg = 0; reg < pmic_reg_count(dev); reg++) {
- ret = pmic_re
ad(dev, reg, &value, 1
);
- if (ret) {
+ ret = pmic_re
g_read(dev, reg
);
+ if (ret
< 0 && ret != -ENODATA
) {
printf("Can't read register: %d\n", reg);
return failure(ret);
}
printf("Can't read register: %d\n", reg);
return failure(ret);
}
@@
-100,7
+103,15
@@
static int do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (!(reg % 16))
printf("\n0x%02x: ", reg);
if (!(reg % 16))
printf("\n0x%02x: ", reg);
- printf("%2.2x ", value);
+ if (ret == -ENODATA) {
+ int i;
+
+ for (i = 0; i < priv->trans_len; i++)
+ puts("--");
+ puts(" ");
+ } else {
+ printf(fmt, ret);
+ }
}
printf("\n");
}
printf("\n");
@@
-109,9
+120,10
@@
static int do_dump(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
+ struct uc_pmic_priv *priv;
struct udevice *dev;
int regs, ret;
struct udevice *dev;
int regs, ret;
-
uint8_t value
;
+
char fmt[24]
;
uint reg;
if (!currdev) {
uint reg;
if (!currdev) {
@@
-120,6
+132,7
@@
static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
dev = currdev;
}
dev = currdev;
+ priv = dev_get_uclass_priv(dev);
if (argc != 2)
return CMD_RET_USAGE;
if (argc != 2)
return CMD_RET_USAGE;
@@
-131,13
+144,15
@@
static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return failure(-EFAULT);
}
return failure(-EFAULT);
}
- ret = pmic_re
ad(dev, reg, &value, 1
);
- if (ret) {
+ ret = pmic_re
g_read(dev, reg
);
+ if (ret
< 0
) {
printf("Can't read PMIC register: %d!\n", reg);
return failure(ret);
}
printf("Can't read PMIC register: %d!\n", reg);
return failure(ret);
}
- printf("0x%02x: 0x%2.2x\n", reg, value);
+ sprintf(fmt, "0x%%02x: 0x%%%d.%dx\n", priv->trans_len * 2,
+ priv->trans_len * 2);
+ printf(fmt, reg, ret);
return CMD_RET_SUCCESS;
}
return CMD_RET_SUCCESS;
}
@@
-145,9
+160,8
@@
static int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
static int do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
struct udevice *dev;
static int do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
struct udevice *dev;
+ uint reg, value;
int regs, ret;
int regs, ret;
- uint8_t value;
- uint reg;
if (!currdev) {
printf("First, set the PMIC device!\n");
if (!currdev) {
printf("First, set the PMIC device!\n");
@@
-168,7
+182,7
@@
static int do_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
value = simple_strtoul(argv[2], NULL, 0);
value = simple_strtoul(argv[2], NULL, 0);
- ret = pmic_
write(dev, reg, &value, 1
);
+ ret = pmic_
reg_write(dev, reg, value
);
if (ret) {
printf("Can't write PMIC register: %d!\n", reg);
return failure(ret);
if (ret) {
printf("Can't write PMIC register: %d!\n", reg);
return failure(ret);