From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F10C5EB64D8 for ; Fri, 16 Jun 2023 15:22:07 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4657786287; Fri, 16 Jun 2023 17:21:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="ZirmFzV0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C08218627B; Fri, 16 Jun 2023 17:21:26 +0200 (CEST) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5FAA786248 for ; Fri, 16 Jun 2023 17:21:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=detlev.casanova@collabora.com Received: from arisu.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by madras.collabora.co.uk (Postfix) with ESMTPSA id 661056606F85; Fri, 16 Jun 2023 16:21:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686928884; bh=A+QogZCz25oCFxbo1UmBBBpWNS/3Uc/2omMAhpIdsX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZirmFzV04l3vLM4UybtfNs8AvUTehW5kCO8gApRe7o5rzokC7FKeNPMfkdP8yL6Ig 2fBpWvSVNZrIbxABSlksogO5m2ETtv+gnNWDzLjYcjSNYVfk2efdFEYFagYAazo3RM D/6vBNBgHzCQgsW6JwgsFLQxRE/xtEeqZIqeWpW7YkMbHMs3h4LF9MCiw8Erv0gVxI knBIu0N7gs755xShHm8Zho5z+ANdMzsEpn9qQinFHQ4LJQNNgjsWD8g8U+Ayi1nOM2 9bocW2qS8iU/Z+WRr8iUuRWBD8YTFk17LQ3Ra3PgnSAg0HJ3iEtQHvHW0V0z7B0SsO 79nEcYhYQiz7g== From: Detlev Casanova To: u-boot@lists.denx.de Cc: Marek Vasut , Hai Pham , Tam Nguyen , Detlev Casanova Subject: [PATCH v1 3/4] sysinfo: rcar3: Implement BOARD_ID and BOARD_REVISION Date: Fri, 16 Jun 2023 11:21:21 -0400 Message-Id: <20230616152122.588168-4-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230616152122.588168-1-detlev.casanova@collabora.com> References: <20230616152122.588168-1-detlev.casanova@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Expose that information to the command shell to let scripts select the correct devicetree name. Signed-off-by: Detlev Casanova --- drivers/sysinfo/rcar3.c | 46 ++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/drivers/sysinfo/rcar3.c b/drivers/sysinfo/rcar3.c index 7b127986da7..89ad46c5422 100644 --- a/drivers/sysinfo/rcar3.c +++ b/drivers/sysinfo/rcar3.c @@ -32,6 +32,8 @@ */ struct sysinfo_rcar_priv { char boardmodel[64]; + u8 id; + char revision[4]; u8 val; }; @@ -48,17 +50,37 @@ static int sysinfo_rcar_get_str(struct udevice *dev, int id, size_t size, char * switch (id) { case SYSINFO_ID_BOARD_MODEL: - strncpy(val, priv->boardmodel, size); - val[size - 1] = '\0'; + strlcpy(val, priv->boardmodel, size); + break; + case SYSINFO_ID_BOARD_REVISION: + strlcpy(val, priv->revision, size); + break; + default: + return -EINVAL; + }; + + val[size - 1] = '\0'; + return 0; +} + +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; 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) @@ -83,7 +105,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Salvator-X%s board rev %c.%c", salvator_xs ? "S" : "", rev_major, rev_minor); - return; + break; case BOARD_STARTER_KIT: if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */ rev_major = (board_rev & BIT(0)) ? '3' : '1'; @@ -92,7 +114,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Starter Kit board rev %c.%c", rev_major, rev_minor); - return; + break; case BOARD_STARTER_KIT_PRE: if (!(board_rev & ~3)) { /* Only rev 0..3 is valid */ rev_major = (board_rev & BIT(1)) ? '2' : '1'; @@ -101,7 +123,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Starter Kit Premier board rev %c.%c", rev_major, rev_minor); - return; + break; case BOARD_EAGLE: if (!board_rev) { /* Only rev 0 is valid */ rev_major = '1'; @@ -110,7 +132,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Eagle board rev %c.%c", rev_major, rev_minor); - return; + break; case BOARD_EBISU_4D: ebisu_4d = true; fallthrough; @@ -122,7 +144,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Ebisu%s board rev %c.%c", ebisu_4d ? "-4D" : "", rev_major, rev_minor); - return; + break; case BOARD_DRAAK: if (!board_rev) { /* Only rev 0 is valid */ rev_major = '1'; @@ -131,7 +153,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Draak board rev %c.%c", rev_major, rev_minor); - return; + break; case BOARD_KRIEK: if (!board_rev) { /* Only rev 0 is valid */ rev_major = '1'; @@ -140,7 +162,7 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Kriek board rev %c.%c", rev_major, rev_minor); - return; + break; case BOARD_CONDOR_I: condor_i = true; fallthrough; @@ -152,13 +174,17 @@ static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas Condor%s board rev %c.%c", condor_i ? "-I" : "", rev_major, rev_minor); - return; + break; default: snprintf(priv->boardmodel, sizeof(priv->boardmodel), "Renesas -Unknown- board rev ?.?"); priv->val = 0xff; return; } + + snprintf(priv->revision, sizeof(priv->revision), "%c.%c", rev_major, + rev_minor); + priv->id = board_id; } static int sysinfo_rcar_probe(struct udevice *dev) -- 2.39.3