powerpc+of: Add of node/property notification chain for adds and removes

[~andy/linux] / drivers / bcma / driver_chipcommon_nflash.c

diff --git a/drivers/bcma/driver_chipcommon_nflash.c b/drivers/bcma/driver_chipcommon_nflash.c
index 574d62435bc2f01718d8bdb5113a3e95ec8e66ab..9042781edec340e932e39d2b75c7dba495764e42 100644 (file)
--- a/drivers/bcma/driver_chipcommon_nflash.c
+++ b/drivers/bcma/driver_chipcommon_nflash.c
@@ -5,15 +5,37 @@
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 
+#include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
-#include <linux/bcma/bcma_driver_chipcommon.h>
-#include <linux/delay.h>
 
 #include "bcma_private.h"
 
+struct platform_device bcma_nflash_dev = {
+       .name           = "bcma_nflash",
+       .num_resources  = 0,
+};
+
 /* Initialize NAND flash access */
 int bcma_nflash_init(struct bcma_drv_cc *cc)
 {
-       bcma_err(cc->core->bus, "NAND flash support is broken\n");
+       struct bcma_bus *bus = cc->core->bus;
+
+       if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 &&
+           cc->core->id.rev != 0x38) {
+               bcma_err(bus, "NAND flash on unsupported board!\n");
+               return -ENOTSUPP;
+       }
+
+       if (!(cc->capabilities & BCMA_CC_CAP_NFLASH)) {
+               bcma_err(bus, "NAND flash not present according to ChipCommon\n");
+               return -ENODEV;
+       }
+
+       cc->nflash.present = true;
+
+       /* Prepare platform device, but don't register it yet. It's too early,
+        * malloc (required by device_private_init) is not available yet. */
+       bcma_nflash_dev.dev.platform_data = &cc->nflash;
+
        return 0;
 }