path: root/drivers
diff options
authorHauke Mehrtens <hauke@hauke-m.de>2015-09-19 14:43:50 +0200
committerKalle Valo <kvalo@codeaurora.org>2015-09-29 10:59:27 +0300
commit69b5f4da26362912e7e56e48c8e1df7fde281e58 (patch)
tree2b67badd2cd749144d5d6224a6d88b542484c970 /drivers
parenta32be01772525eba2001be23a570d9e31c58273d (diff)
bcma: add support for population subnodes also when build as module
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>
Diffstat (limited to 'drivers')
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 24882c18fcbe..59d8d0d14824 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -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 */

Privacy Policy