aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bcma/host_soc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bcma/host_soc.c')
-rw-r--r--drivers/bcma/host_soc.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 379e0d4ebe72..718e054dd727 100644
--- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c
@@ -165,7 +165,6 @@ static const struct bcma_host_ops bcma_host_soc_ops = {
165int __init bcma_host_soc_register(struct bcma_soc *soc) 165int __init bcma_host_soc_register(struct bcma_soc *soc)
166{ 166{
167 struct bcma_bus *bus = &soc->bus; 167 struct bcma_bus *bus = &soc->bus;
168 int err;
169 168
170 /* iomap only first core. We have to read some register on this core 169 /* iomap only first core. We have to read some register on this core
171 * to scan the bus. 170 * to scan the bus.
@@ -181,7 +180,15 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
181 /* Initialize struct, detect chip */ 180 /* Initialize struct, detect chip */
182 bcma_init_bus(bus); 181 bcma_init_bus(bus);
183 182
184 /* Register */ 183 return 0;
184}
185
186int __init bcma_host_soc_init(struct bcma_soc *soc)
187{
188 struct bcma_bus *bus = &soc->bus;
189 int err;
190
191 /* Scan bus and initialize it */
185 err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips); 192 err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
186 if (err) 193 if (err)
187 iounmap(bus->mmio); 194 iounmap(bus->mmio);