diff options
| author | Oleksij Rempel <o.rempel@pengutronix.de> | 2021-10-06 10:43:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-10-11 11:35:54 +0200 |
| commit | 2e12df8bfa9bfaaed2d550334d61fade9c228fed (patch) | |
| tree | b3f046ad331ecf4085c70bce5713b9d42401821f /arch/arm | |
| parent | e78d32e74a7a8b9fe30ca9ef89ca6e05e5004a7e (diff) | |
| download | barebox-2e12df8bfa9bfaaed2d550334d61fade9c228fed.tar.gz barebox-2e12df8bfa9bfaaed2d550334d61fade9c228fed.tar.xz | |
ARM: boards: skov-imx6: fixup_machine_compatible() add optional root node
This will be needed by the next patch
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.barebox.org/20211006084323.14051-3-o.rempel@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/skov-imx6/board.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/boards/skov-imx6/board.c b/arch/arm/boards/skov-imx6/board.c index a58172b2b1..030ac62c52 100644 --- a/arch/arm/boards/skov-imx6/board.c +++ b/arch/arm/boards/skov-imx6/board.c @@ -432,16 +432,18 @@ static void skov_init_board(const struct board_description *variant) } } -static void fixup_machine_compatible(const char *compat) +static void fixup_machine_compatible(const char *compat, + struct device_node *root) { const char *curcompat; - struct device_node *root; int cclen = 0, clen = strlen(compat) + 1; void *buf; - root = of_get_root_node(); - if (!root) - return; + if (!root) { + root = of_get_root_node(); + if (!root) + return; + } curcompat = of_get_property(root, "compatible", &cclen); @@ -487,7 +489,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); + fixup_machine_compatible(variant->dts_compatible, NULL); skov_init_board(variant); |