From 04adea5f3c43e4d1570cbc16c0193b26675b360e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Mon, 12 Nov 2012 13:03:25 +0100
Subject: [PATCH] --- yaml --- r: 347194 b: refs/heads/master c:
 00940a23475f31870cb777d5017b6f160542f3fd h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/mtd/nand/bcm47xxnflash/Makefile        | 2 +-
 trunk/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 2 ++
 trunk/drivers/mtd/nand/bcm47xxnflash/main.c          | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 17170054918f..0e9ee5e06231 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c01d4cb7576ff79e13ba7d7fb884e63e6f07bbd
+refs/heads/master: 00940a23475f31870cb777d5017b6f160542f3fd
diff --git a/trunk/drivers/mtd/nand/bcm47xxnflash/Makefile b/trunk/drivers/mtd/nand/bcm47xxnflash/Makefile
index 4f688f9655ad..f05b119e134b 100644
--- a/trunk/drivers/mtd/nand/bcm47xxnflash/Makefile
+++ b/trunk/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/trunk/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/trunk/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 264aec448fc4..0bdb2ce4da75 100644
--- a/trunk/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/trunk/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/trunk/drivers/mtd/nand/bcm47xxnflash/main.c b/trunk/drivers/mtd/nand/bcm47xxnflash/main.c
index fc9139de4dfa..2b8b05bec3dd 100644
--- a/trunk/drivers/mtd/nand/bcm47xxnflash/main.c
+++ b/trunk/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;