diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2012-11-12 13:03:25 +0100 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-22 09:32:49 +0200 |
| commit | 00940a23475f31870cb777d5017b6f160542f3fd (patch) | |
| tree | fae7c6433b6926d73a8bc3213e468aeba1919ecd | |
| parent | 3c01d4cb7576ff79e13ba7d7fb884e63e6f07bbd (diff) | |
| download | linux-3.10-00940a23475f31870cb777d5017b6f160542f3fd.tar.gz linux-3.10-00940a23475f31870cb777d5017b6f160542f3fd.tar.bz2 linux-3.10-00940a23475f31870cb777d5017b6f160542f3fd.zip | |
mtd: bcm47xxnflash: enable BCM4706 driver
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
| -rw-r--r-- | drivers/mtd/nand/bcm47xxnflash/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/bcm47xxnflash/main.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/nand/bcm47xxnflash/Makefile b/drivers/mtd/nand/bcm47xxnflash/Makefile index 4f688f9655a..f05b119e134 100644 --- a/drivers/mtd/nand/bcm47xxnflash/Makefile +++ b/drivers/mtd/nand/bcm47xxnflash/Makefile @@ -1,4 +1,4 @@ bcm47xxnflash-y += main.o -bcm47xxnflash- += ops_bcm4706.o +bcm47xxnflash-y += ops_bcm4706.o obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash.o diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h index 264aec448fc..0bdb2ce4da7 100644 --- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h +++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h @@ -17,4 +17,6 @@ struct bcm47xxnflash { u8 id_data[8]; }; +int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n); + #endif /* BCM47XXNFLASH */ diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c index fc9139de4df..2b8b05bec3d 100644 --- a/drivers/mtd/nand/bcm47xxnflash/main.c +++ b/drivers/mtd/nand/bcm47xxnflash/main.c @@ -40,8 +40,8 @@ static int bcm47xxnflash_probe(struct platform_device *pdev) b47n->mtd.priv = &b47n->nand_chip; /* Required */ b47n->cc = container_of(nflash, struct bcma_drv_cc, nflash); - if (0) { - /* TODO: init device */ + if (b47n->cc->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) { + err = bcm47xxnflash_ops_bcm4706_init(b47n); } else { pr_err("Device not supported\n"); err = -ENOTSUPP; |