Skip to content

Commit

Permalink
of: Move simple-framebuffer device handling from simplefb to of
Browse files Browse the repository at this point in the history
This code is required for both simplefb and simpledrm, so let's move it
into the OF core instead of having it as an ad-hoc initcall in the
drivers.

Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20211212062407.138309-2-marcan@marcan.st
  • Loading branch information
Hector Martin authored and Thomas Zimmermann committed Dec 16, 2021
1 parent 938db27 commit 2f92ea2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
4 changes: 4 additions & 0 deletions drivers/of/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,10 @@ static int __init of_platform_default_populate_init(void)
of_node_put(node);
}

node = of_get_compatible_child(of_chosen, "simple-framebuffer");
of_platform_device_create(node, NULL, NULL);
of_node_put(node);

/* Populate everything else. */
of_platform_default_populate(NULL, NULL, NULL);

Expand Down
21 changes: 1 addition & 20 deletions drivers/video/fbdev/simplefb.c
Original file line number Diff line number Diff line change
Expand Up @@ -530,26 +530,7 @@ static struct platform_driver simplefb_driver = {
.remove = simplefb_remove,
};

static int __init simplefb_init(void)
{
int ret;
struct device_node *np;

ret = platform_driver_register(&simplefb_driver);
if (ret)
return ret;

if (IS_ENABLED(CONFIG_OF_ADDRESS) && of_chosen) {
for_each_child_of_node(of_chosen, np) {
if (of_device_is_compatible(np, "simple-framebuffer"))
of_platform_device_create(np, NULL, NULL);
}
}

return 0;
}

fs_initcall(simplefb_init);
module_platform_driver(simplefb_driver);

MODULE_AUTHOR("Stephen Warren <swarren@wwwdotorg.org>");
MODULE_DESCRIPTION("Simple framebuffer driver");
Expand Down

0 comments on commit 2f92ea2

Please sign in to comment.