bcma: add support for population subnodes also when build as module
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 19 Sep 2015 12:43:50 +0000 (14:43 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 29 Sep 2015 07:59:27 +0000 (10:59 +0300)
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>
drivers/bcma/main.c

index 24882c18fcbe6911c7266aa4dcf42903ffb7dbef..59d8d0d14824d0bbfcb5f20fdb6312261f2c79a2 100644 (file)
@@ -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 */