From: Oleksij Rempel <o.rempel@pengutronix.de> To: barebox@lists.infradead.org Cc: Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v4 4/5] ARM: boards: skov-imx6: make use of of_fixup_machine_compatible() Date: Fri, 29 Apr 2022 09:30:33 +0200 [thread overview] Message-ID: <20220429073034.197362-5-o.rempel@pengutronix.de> (raw) In-Reply-To: <20220429073034.197362-1-o.rempel@pengutronix.de> Replace board specific fixup_machine_compatible() with generic of_fixup_machine_compatible() Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- arch/arm/boards/skov-imx6/board.c | 40 +++---------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/arch/arm/boards/skov-imx6/board.c b/arch/arm/boards/skov-imx6/board.c index 2702bc1de9..53c213f33b 100644 --- a/arch/arm/boards/skov-imx6/board.c +++ b/arch/arm/boards/skov-imx6/board.c @@ -312,55 +312,21 @@ static int skov_board_no = -1; static bool skov_have_switch = true; static const char *no_switch_suffix = "-noswitch"; -static void fixup_machine_compatible(const char *compat, - struct device_node *root) -{ - int cclen = 0, clen = strlen(compat) + 1; - const char *curcompat; - void *buf; - - if (!root) { - root = of_get_root_node(); - if (!root) - return; - } - - curcompat = of_get_property(root, "compatible", &cclen); - - buf = xzalloc(cclen + clen); - - memcpy(buf, compat, clen); - memcpy(buf + clen, curcompat, cclen); - - /* - * Prepend the compatible from board entry to the machine compatible. - * Used to match bootspec entries against it. - */ - of_set_property(root, "compatible", buf, cclen + clen, true); - - free(buf); -} - static void fixup_noswitch_machine_compatible(struct device_node *root) { const char *compat = imx6_variants[skov_board_no].dts_compatible; const char *generic = "skov,imx6"; - size_t size, size_generic; char *buf; - size = strlen(compat) + strlen(no_switch_suffix) + 1; - size_generic = strlen(generic) + strlen(no_switch_suffix) + 1; - size = max(size, size_generic); - /* add generic compatible, so systemd&co can make right decisions */ buf = xasprintf("%s%s", generic, no_switch_suffix); - fixup_machine_compatible(buf, root); + of_fixup_machine_compatible(root, buf); /* add specific compatible as fallback, in case this board has new * challenges. */ buf = xasprintf("%s%s", compat, no_switch_suffix); - fixup_machine_compatible(buf, root); + of_fixup_machine_compatible(root, buf); free(buf); } @@ -648,7 +614,7 @@ static int skov_imx6_probe(struct device_d *dev) globalvar_add_simple("board.dts", variant->dts_compatible); globalvar_add_simple("board.display", variant->display ?: NULL); - fixup_machine_compatible(variant->dts_compatible, NULL); + of_fixup_machine_compatible(NULL, variant->dts_compatible); skov_init_board(variant); -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-04-29 7:32 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-29 7:30 [PATCH v4 0/5] add different OF board fixups Oleksij Rempel 2022-04-29 7:30 ` [PATCH v4 1/5] common: add $global.serial_number with device tree fixup Oleksij Rempel 2022-04-29 7:30 ` [PATCH v4 2/5] ARM: boards: protonic-imx6: make use of barebox_set_serial_number() Oleksij Rempel 2022-04-29 7:30 ` [PATCH v4 3/5] of: add generic of_fixup_machine_compatible() Oleksij Rempel 2022-04-29 7:30 ` Oleksij Rempel [this message] 2022-04-29 7:30 ` [PATCH v4 5/5] ARM: boards: protonic-imx6: add HW revision specific machine compatible Oleksij Rempel
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=20220429073034.197362-5-o.rempel@pengutronix.de \ --to=o.rempel@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH v4 4/5] ARM: boards: skov-imx6: make use of of_fixup_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