summaryrefslogtreecommitdiffstats
path: root/drivers/bcma/main.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2012-08-10 21:23:53 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-08-21 16:05:52 -0400
commitd57ef3a6a2eeb88df47e892c66692e3f59722ffe (patch)
treedb2f260a55ce24cfed110cb6281674a5fbcb0a86 /drivers/bcma/main.c
parent01e17dacd47101ad7d33152bbfbbd4394352d2e6 (diff)
downloadtalos-op-linux-d57ef3a6a2eeb88df47e892c66692e3f59722ffe.tar.gz
talos-op-linux-d57ef3a6a2eeb88df47e892c66692e3f59722ffe.zip
bcma: detect and register serial flash device
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/main.c')
-rw-r--r--drivers/bcma/main.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 758af9ccdef0..a501d259287c 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -7,6 +7,7 @@
#include "bcma_private.h"
#include <linux/module.h>
+#include <linux/platform_device.h>
#include <linux/bcma/bcma.h>
#include <linux/slab.h>
@@ -136,6 +137,14 @@ static int bcma_register_cores(struct bcma_bus *bus)
dev_id++;
}
+#ifdef CONFIG_BCMA_SFLASH
+ if (bus->drv_cc.sflash.present) {
+ err = platform_device_register(&bcma_sflash_dev);
+ if (err)
+ bcma_err(bus, "Error registering serial flash\n");
+ }
+#endif
+
return 0;
}
OpenPOWER on IntegriCloud