aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2012-11-12 07:03:25 -0500
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-11-22 02:32:49 -0500
commit00940a23475f31870cb777d5017b6f160542f3fd (patch)
treefae7c6433b6926d73a8bc3213e468aeba1919ecd
parent3c01d4cb7576ff79e13ba7d7fb884e63e6f07bbd (diff)
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/Makefile2
-rw-r--r--drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h2
-rw-r--r--drivers/mtd/nand/bcm47xxnflash/main.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/nand/bcm47xxnflash/Makefile b/drivers/mtd/nand/bcm47xxnflash/Makefile
index 4f688f9655ad..f05b119e134b 100644
--- a/drivers/mtd/nand/bcm47xxnflash/Makefile
+++ b/drivers/mtd/nand/bcm47xxnflash/Makefile
@@ -1,4 +1,4 @@
1bcm47xxnflash-y += main.o 1bcm47xxnflash-y += main.o
2bcm47xxnflash- += ops_bcm4706.o 2bcm47xxnflash-y += ops_bcm4706.o
3 3
4obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash.o 4obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash.o
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 264aec448fc4..0bdb2ce4da75 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -17,4 +17,6 @@ struct bcm47xxnflash {
17 u8 id_data[8]; 17 u8 id_data[8];
18}; 18};
19 19
20int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n);
21
20#endif /* BCM47XXNFLASH */ 22#endif /* BCM47XXNFLASH */
diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c
index fc9139de4dfa..2b8b05bec3dd 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)
40 b47n->mtd.priv = &b47n->nand_chip; /* Required */ 40 b47n->mtd.priv = &b47n->nand_chip; /* Required */
41 b47n->cc = container_of(nflash, struct bcma_drv_cc, nflash); 41 b47n->cc = container_of(nflash, struct bcma_drv_cc, nflash);
42 42
43 if (0) { 43 if (b47n->cc->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {
44 /* TODO: init device */ 44 err = bcm47xxnflash_ops_bcm4706_init(b47n);
45 } else { 45 } else {
46 pr_err("Device not supported\n"); 46 pr_err("Device not supported\n");
47 err = -ENOTSUPP; 47 err = -ENOTSUPP;