From: Ahmad Fatoum <a.fatoum@pengutronix.de> To: Oleksij Rempel <o.rempel@pengutronix.de>, barebox@lists.infradead.org, Rouven Czerwinski <rcz@pengutronix.de> Subject: Re: [PATCH v1 3/5] of: add generic of_fixup_machine_compatible() Date: Wed, 27 Apr 2022 09:53:31 +0200 [thread overview] Message-ID: <ee9ae311-8b76-9c23-d2a2-2f22225cd4fd@pengutronix.de> (raw) In-Reply-To: <20220427073724.3126601-3-o.rempel@pengutronix.de> On 27.04.22 09:37, Oleksij Rempel wrote: > Add generic function to extend/fixup machine compatible. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Cc += Rouven, who had a similar use case > --- > common/oftree.c | 30 ++++++++++++++++++++++++++++++ > include/of.h | 6 ++++++ > 2 files changed, 36 insertions(+) > > diff --git a/common/oftree.c b/common/oftree.c > index c6d75055cc..0a66882946 100644 > --- a/common/oftree.c > +++ b/common/oftree.c > @@ -487,3 +487,33 @@ int of_autoenable_i2c_by_component(char *path) > > return ret; > } > + > +int of_fixup_machine_compatible(struct device_node *root, const char *compat) > +{ > + int cclen = 0, clen = strlen(compat) + 1; > + const char *curcompat; > + void *buf; > + > + if (!root) { > + root = of_get_root_node(); > + if (!root) > + return -ENODEV; > + } > + > + curcompat = of_get_property(root, "compatible", &cclen); > + > + buf = xzalloc(cclen + clen); > + > + memcpy(buf, compat, clen); add an if (curcompat) > + 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); That way it should work even if there was no compatible property to begin with. If you feel like it, you could add a new $global.of_compatible to make this easier to test. :)) > + > + free(buf); > + > + return 0; > +} > diff --git a/include/of.h b/include/of.h > index cf9950e9b3..9f514c5ec2 100644 > --- a/include/of.h > +++ b/include/of.h > @@ -316,6 +316,7 @@ struct device_node *of_find_node_by_path_or_alias(struct device_node *root, > const char *str); > int of_autoenable_device_by_path(char *path); > int of_autoenable_i2c_by_component(char *path); > +int of_fixup_machine_compatible(struct device_node *root, const char *compat); > #else > static inline bool of_node_name_eq(const struct device_node *np, const char *name) > { > @@ -834,6 +835,11 @@ static inline int of_autoenable_i2c_by_component(char *path) > return -ENODEV; > } > > +static int of_fixup_machine_compatible(struct device_node *root, > + const char *compat) > +{ > + return -ENODEV; > +} > > #endif > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-04-27 7:55 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-27 7:37 [PATCH v1 1/5] common: add $global.serial_number with device tree fixup Oleksij Rempel 2022-04-27 7:37 ` [PATCH v1 2/5] ARM: boards: protonic-imx6: make use of barebox_set_serial_number() Oleksij Rempel 2022-04-27 7:37 ` [PATCH v1 3/5] of: add generic of_fixup_machine_compatible() Oleksij Rempel 2022-04-27 7:53 ` Ahmad Fatoum [this message] 2022-04-27 7:37 ` [PATCH v1 4/5] ARM: boards: skov-imx6: make use of of_fixup_machine_compatible() Oleksij Rempel 2022-04-27 7:37 ` [PATCH v1 5/5] ARM: boards: protonic-imx6: add HW revision specific machine compatible Oleksij Rempel 2022-04-27 8:00 ` Ahmad Fatoum
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=ee9ae311-8b76-9c23-d2a2-2f22225cd4fd@pengutronix.de \ --to=a.fatoum@pengutronix.de \ --cc=barebox@lists.infradead.org \ --cc=o.rempel@pengutronix.de \ --cc=rcz@pengutronix.de \ --subject='Re: [PATCH v1 3/5] of: add generic 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