From: Oleksij Rempel <o.rempel@pengutronix.de> To: barebox@lists.infradead.org Cc: Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v5 5/5] ARM: boards: protonic-imx6: add HW revision specific machine compatible Date: Tue, 3 May 2022 06:42:06 +0200 [thread overview] Message-ID: <20220503044206.3232712-6-o.rempel@pengutronix.de> (raw) In-Reply-To: <20220503044206.3232712-1-o.rempel@pengutronix.de> Currently we use generic/pinned machine compatible for different HW revisions. With this patch we extend this compatible string with HW revision specific. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- arch/arm/boards/protonic-imx6/board.c | 22 ++++++++++++++++++---- arch/arm/mach-imx/Kconfig | 1 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c index 0fadd148b4..cdbb8debe6 100644 --- a/arch/arm/boards/protonic-imx6/board.c +++ b/arch/arm/boards/protonic-imx6/board.c @@ -126,6 +126,22 @@ static const struct gpio prt_imx6_kvg_gpios[] = { }, }; +static int prt_of_fixup_hwrev(struct prt_imx6_priv *priv) +{ + const char *compat; + char *buf; + + compat = of_device_get_match_compatible(priv->dev); + + buf = xasprintf("%s-m%u-r%u", compat, priv->hw_id, + priv->hw_rev); + barebox_set_of_machine_compatible(buf); + + free(buf); + + return 0; +} + static int prt_imx6_read_rfid(struct prt_imx6_priv *priv, void *buf, size_t size) { @@ -797,7 +813,6 @@ exit_get_dcfg: static int prt_imx6_probe(struct device_d *dev) { struct prt_imx6_priv *priv; - const char *name, *ptr; struct param_d *p; int ret; @@ -806,9 +821,7 @@ static int prt_imx6_probe(struct device_d *dev) return -ENOMEM; priv->dev = dev; - name = of_device_get_match_compatible(priv->dev); - ptr = strchr(name, ','); - priv->name = ptr ? ptr + 1 : name; + priv->name = of_get_machine_compatible(); pr_info("Detected machine type: %s\n", priv->name); @@ -818,6 +831,7 @@ static int prt_imx6_probe(struct device_d *dev) pr_info(" HW type: %d\n", priv->hw_id); pr_info(" HW revision: %d\n", priv->hw_rev); + prt_of_fixup_hwrev(priv); ret = prt_imx6_get_dcfg(priv); if (ret) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ee313a1502..147cd000f9 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -351,6 +351,7 @@ config MACH_PROTONIC_IMX6 select ARCH_IMX6UL select ARM_USE_COMPRESSED_DTB select SERIAL_NUMBER_FIXUP + select MACHINE_FIXUP config MACH_PROTONIC_IMX8M bool "Protonic-Holland i.MX8Mx based boards" -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2022-05-03 4:44 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-03 4:42 [PATCH v5 0/5] add different OF board fixups Oleksij Rempel 2022-05-03 4:42 ` [PATCH v5 1/5] common: add $global.serial_number with device tree fixup Oleksij Rempel 2022-05-03 4:42 ` [PATCH v5 2/5] ARM: boards: protonic-imx6: make use of barebox_set_serial_number() Oleksij Rempel 2022-05-03 4:42 ` [PATCH v5 3/5] of: add generic of_fixup_machine_compatible() Oleksij Rempel 2022-05-03 7:03 ` Sascha Hauer 2022-05-03 4:42 ` [PATCH v5 4/5] ARM: boards: skov-imx6: make use of of_fixup_machine_compatible() Oleksij Rempel 2022-05-03 4:42 ` Oleksij Rempel [this message]
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=20220503044206.3232712-6-o.rempel@pengutronix.de \ --to=o.rempel@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH v5 5/5] ARM: boards: protonic-imx6: add HW revision specific machine compatible' \ /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