diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2012-08-12 13:08:05 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-21 16:05:53 -0400 |
commit | 371a00448f95adaa612cf1a0b31a11e7093bc706 (patch) | |
tree | 6ffb57fcb3050a54942ffd320c149780da41b841 /drivers/bcma/driver_chipcommon_nflash.c | |
parent | d57ef3a6a2eeb88df47e892c66692e3f59722ffe (diff) | |
download | lwn-371a00448f95adaa612cf1a0b31a11e7093bc706.tar.gz lwn-371a00448f95adaa612cf1a0b31a11e7093bc706.zip |
bcma: detect and register NAND 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/driver_chipcommon_nflash.c')
-rw-r--r-- | drivers/bcma/driver_chipcommon_nflash.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/drivers/bcma/driver_chipcommon_nflash.c b/drivers/bcma/driver_chipcommon_nflash.c index 574d62435bc2..9042781edec3 100644 --- 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; } |