From: Robin van der Gracht <robin@protonic.nl> To: barebox@lists.infradead.org Cc: Oleksij Rempel <o.rempel@pengutronix.de>, Robin van der Gracht <robin@protonic.nl>, david@protonic.nl Subject: [PATCH 9/9] ARM: boards: protonic-imx6: Register serial_number parameter with ocotp Date: Thu, 16 Jun 2022 15:11:14 +0200 [thread overview] Message-ID: <20220616131114.214628-10-robin@protonic.nl> (raw) In-Reply-To: <20220616131114.214628-1-robin@protonic.nl> Signed-off-by: Robin van der Gracht <robin@protonic.nl> --- arch/arm/boards/protonic-imx6/board.c | 39 ++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c index dd2c041e07..8436903fd8 100644 --- a/arch/arm/boards/protonic-imx6/board.c +++ b/arch/arm/boards/protonic-imx6/board.c @@ -90,6 +90,7 @@ struct prt_imx6_priv { unsigned int hw_rev; const char *name; unsigned int no_usb_check; + char *ocotp_serial; }; struct prti6q_rfid_contents { @@ -252,7 +253,6 @@ static int prt_imx6_read_i2c_mac_serial(struct prt_imx6_priv *priv) static int prt_imx6_read_ocotp_serial(struct prt_imx6_priv *priv) { int ret; - char serial[11]; unsigned val; ret = imx_ocotp_read_field(OCOTP_GP1, &val); @@ -265,9 +265,31 @@ static int prt_imx6_read_ocotp_serial(struct prt_imx6_priv *priv) return -EINVAL; val &= PRT_IMX6_GP1_FMT_DEC - 1; - snprintf(serial, sizeof(serial), "%u", val); + priv->ocotp_serial = xasprintf("%u", val); - return prt_imx6_set_serial(priv, serial); + return prt_imx6_set_serial(priv, priv->ocotp_serial); +} + +static int prt_imx6_set_ocotp_serial(struct param_d *param, void *driver_priv) +{ + struct prt_imx6_priv *priv = driver_priv; + int ret; + unsigned val; + + ret = kstrtouint(priv->ocotp_serial, 10, &val); + if (ret) + return ret; + + if (val & PRT_IMX6_GP1_FMT_DEC) + return -ERANGE; + val |= PRT_IMX6_GP1_FMT_DEC; + + ret = imx_ocotp_write_field(OCOTP_GP1, val); + if (ret) + return ret; + + barebox_set_serial_number(priv->ocotp_serial); + return 0; } static int prt_imx6_usb_mount(struct prt_imx6_priv *priv) @@ -536,6 +558,8 @@ exit_bbu: static int prt_imx6_devices_init(void) { struct prt_imx6_priv *priv = prt_priv; + struct device_d *ocotp_dev; + struct param_d *p; if (!priv) return 0; @@ -558,6 +582,15 @@ static int prt_imx6_devices_init(void) prt_imx6_env_init(priv); + ocotp_dev = get_device_by_name("ocotp0"); + if (ocotp_dev) { + p = dev_add_param_string(ocotp_dev, "serial_number", + prt_imx6_set_ocotp_serial, NULL, + &priv->ocotp_serial, priv); + if (IS_ERR(p)) + return PTR_ERR(p); + } + return 0; } late_initcall(prt_imx6_devices_init); -- 2.34.1
next prev parent reply other threads:[~2022-06-16 13:12 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-16 13:11 [PATCH 0/9] ARM: boards: protonic-imx6: Updates Robin van der Gracht 2022-06-16 13:11 ` [PATCH 1/9] ARM: boards: protonic-imx6: prtvt7 hardkey inputs are active low Robin van der Gracht 2022-06-16 16:28 ` Oleksij Rempel 2022-06-16 16:38 ` Oleksij Rempel 2022-06-17 6:57 ` Sascha Hauer 2022-06-17 8:44 ` Marco Felsch 2022-06-20 7:51 ` Ahmad Fatoum 2022-06-20 8:16 ` Robin van der Gracht 2022-06-20 15:42 ` Robin van der Gracht 2022-06-20 6:48 ` Robin van der Gracht 2022-06-20 7:23 ` Oleksij Rempel 2022-06-16 13:11 ` [PATCH 2/9] ARM: boards: protonic-imx6: Update comment to match a recent code update Robin van der Gracht 2022-06-17 7:00 ` Sascha Hauer 2022-06-20 6:40 ` Robin van der Gracht 2022-06-16 13:11 ` [PATCH 3/9] ARM: boards: protonic-imx6: Free allocated autoboot_timeout string Robin van der Gracht 2022-06-16 13:11 ` [PATCH 4/9] ARM: boards: protonic-imx6: Always free allocated alias string Robin van der Gracht 2022-06-16 13:11 ` [PATCH 5/9] ARM: boards: protonic-imx6: Remove unsused argument from prt_imx6_usb_mount Robin van der Gracht 2022-06-16 13:11 ` [PATCH 6/9] ARM: boards: protonic-imx6: Register prt-usb boot entry Robin van der Gracht 2022-06-16 13:11 ` [PATCH 7/9] ARM: boards: protonic-imx6: Remove usb_delay from the priv struct Robin van der Gracht 2022-06-16 13:11 ` [PATCH 8/9] ARM: boards: protonic-imx6: Read serial and mac from fuses if available Robin van der Gracht 2022-06-16 13:11 ` Robin van der Gracht [this message] 2022-06-17 7:10 ` (subset) [PATCH 0/9] ARM: boards: protonic-imx6: Updates Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220616131114.214628-10-robin@protonic.nl \ --to=robin@protonic.nl \ --cc=barebox@lists.infradead.org \ --cc=david@protonic.nl \ --cc=o.rempel@pengutronix.de \ --subject='Re: [PATCH 9/9] ARM: boards: protonic-imx6: Register serial_number parameter with ocotp' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox