Skip to content

Commit

Permalink
bcma: add support for population subnodes also when build as module
Browse files Browse the repository at this point in the history
of_default_bus_match_table was not exported earlier, so it could only
be accessed by code compiled into the kernel. A new function
of_platform_default_populate() was added which uses
of_default_bus_match_table and this function is also exported. This way
it is possible to create a bus with the content of
of_default_bus_match_table and we can remove the hacks from bcma.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
Hauke Mehrtens authored and Kalle Valo committed Sep 29, 2015
1 parent a32be01 commit 69b5f4d
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/bcma/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,13 +436,8 @@ int bcma_bus_register(struct bcma_bus *bus)
}

dev = bcma_bus_get_host_dev(bus);
/* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when
* of_default_bus_match_table is exported or in some other way
* accessible. This is just a temporary workaround.
*/
if (IS_BUILTIN(CONFIG_BCMA) && dev) {
of_platform_populate(dev->of_node, of_default_bus_match_table,
NULL, dev);
if (dev) {
of_platform_default_populate(dev->of_node, NULL, dev);
}

/* Cores providing flash access go before SPROM init */
Expand Down

0 comments on commit 69b5f4d

Please sign in to comment.