Expose that information to the sysinfo command to let scripts make
decisions based on the board id and revision.
Signed-off-by: Detlev Casanova <detlev.casan...@collabora.com>
---
drivers/sysinfo/rcar3.c | 103 +++++++++++++++++++++++++++-------------
1 file changed, 70 insertions(+), 33 deletions(-)
diff --git a/drivers/sysinfo/rcar3.c b/drivers/sysinfo/rcar3.c
index 450a4c26773..1a99642bf75 100644
--- a/drivers/sysinfo/rcar3.c
+++ b/drivers/sysinfo/rcar3.c
@@ -32,6 +32,10 @@
*/
struct sysinfo_rcar_priv {
char boardmodel[64];
+ u8 id;
+ u8 rev_major;
+ u8 rev_minor;
+ bool has_rev;
u8 val;
};
@@ -56,9 +60,33 @@ static int sysinfo_rcar_get_str(struct udevice *dev, int id,
size_t size, char *
};
}
+static int sysinfo_rcar_get_int(struct udevice *dev, int id, int *val)
+{
+ struct sysinfo_rcar_priv *priv = dev_get_priv(dev);
+
+ switch (id) {
+ case SYSINFO_ID_BOARD_ID:
+ *val = priv->id;
+ return 0;
+ case SYSINFO_ID_BOARD_REVISION_MAJOR:
+ if (!priv->has_rev)
+ return -EINVAL;
+ *val = priv->rev_major;
+ return 0;
+ case SYSINFO_ID_BOARD_REVISION_MINOR:
+ if (!priv->has_rev)
+ return -EINVAL;
+ *val = priv->rev_minor;
+ return 0;
+ default:
+ return -EINVAL;
+ };
+}
+
static const struct sysinfo_ops sysinfo_rcar_ops = {
.detect = sysinfo_rcar_detect,
.get_str = sysinfo_rcar_get_str,
+ .get_int = sysinfo_rcar_get_int,
};
static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
@@ -70,8 +98,9 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv)
bool condor_i = false;
char model[64];
char rev[4] = "?.?";
- u8 rev_major = 0;
- u8 rev_minor = 0;
+
+ priv->id = board_id;
+ priv->has_rev = false;
switch (board_id) {
case BOARD_SALVATOR_XS:
@@ -81,9 +110,10 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv
*priv)
snprintf(model, sizeof(model),
"Renesas Salvator-X%s board", salvator_xs ? "S" : "");
if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */
- rev_major = 1;
- rev_minor = board_rev & BIT(0);
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = 1;
+ priv->rev_minor = board_rev & BIT(0);
+ priv->has_rev = true;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
@@ -91,34 +121,37 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv
*priv)
return;
case BOARD_STARTER_KIT:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Starter Kit board");
if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */
- rev_major = (board_rev & BIT(0)) ? 3 : 1;
- rev_minor = 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = (board_rev & BIT(0)) ? 3 : 1;
+ priv->rev_minor = 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
return;
case BOARD_STARTER_KIT_PRE:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Starter Kit Premier board");
if (!(board_rev & ~3)) { /* Only rev 0..3 is valid */
- rev_major = (board_rev & BIT(1)) ? 2 : 1;
- rev_minor = (board_rev == 3) ? 1 : 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = (board_rev & BIT(1)) ? 2 : 1;
+ priv->rev_minor = (board_rev == 3) ? 1 : 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
return;
case BOARD_EAGLE:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Eagle board");
if (!board_rev) { /* Only rev 0 is valid */
- rev_major = 1;
- rev_minor = 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = 1;
+ priv->rev_minor = 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
@@ -127,34 +160,37 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv
*priv)
ebisu_4d = true;
fallthrough;
case BOARD_EBISU:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Ebisu%s board", ebisu_4d ? "-4D" : "");
if (!board_rev) { /* Only rev 0 is valid */
- rev_major = 1;
- rev_minor = 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = 1;
+ priv->rev_minor = 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
return;
case BOARD_DRAAK:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Draak board");
if (!board_rev) { /* Only rev 0 is valid */
- rev_major = 1;
- rev_minor = 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = 1;
+ priv->rev_minor = 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
return;
case BOARD_KRIEK:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Kriek board");
if (!board_rev) { /* Only rev 0 is valid */
- rev_major = 1;
- rev_minor = 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = 1;
+ priv->rev_minor = 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
@@ -163,12 +199,13 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv
*priv)
condor_i = true;
fallthrough;
case BOARD_CONDOR:
- snprintf(priv->boardmodel, sizeof(priv->boardmodel),
+ snprintf(model, sizeof(model),
"Renesas Condor%s board", condor_i ? "-I" : "");
if (!board_rev) { /* Only rev 0 is valid */
- rev_major = 1;
- rev_minor = 0;
- snprintf(rev, sizeof(rev), "%u.%u", rev_major,
rev_minor);
+ priv->rev_major = 1;
+ priv->rev_minor = 0;
+ snprintf(rev, sizeof(rev), "%u.%u", priv->rev_major,
priv->rev_minor);
+ priv->has_rev = true;
}
snprintf(priv->boardmodel, sizeof(priv->boardmodel), "%s rev
%s",
model, rev);
--
2.41.0
