From 553d8ab779af68a49c9eafea8c0895609645579b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 6 Mar 2013 12:34:19 +0100
Subject: [PATCH] --- yaml --- r: 374751 b: refs/heads/master c:
 1f816bc729fd5dec7c3633b0a54b75dc7a1fea0f h: refs/heads/master i:   374749:
 9856676705fc99a7b0b9a86d2b245752d867dd0a   374747:
 7d0905eb7dbd1b8d5fecb4fbdd837e14cfc0a6d7   374743:
 d6e0d8d83d83892636393455ff99cdfe49b44474   374735:
 e44bfe3044d99f1227fbbb48f90893a867498b2f   374719:
 cba5ab6e8444bef4fe90273228839deb25e49ab8 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/mtd/devices/bcm47xxsflash.c | 9 +++++++++
 trunk/drivers/mtd/devices/bcm47xxsflash.h | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fdc7eeb3d895..459e77a4dad1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41c81536ea25d17933b5b503053a5990ec05502a
+refs/heads/master: 1f816bc729fd5dec7c3633b0a54b75dc7a1fea0f
diff --git a/trunk/drivers/mtd/devices/bcm47xxsflash.c b/trunk/drivers/mtd/devices/bcm47xxsflash.c
index b0705741fd93..18e7761137a3 100644
--- a/trunk/drivers/mtd/devices/bcm47xxsflash.c
+++ b/trunk/drivers/mtd/devices/bcm47xxsflash.c
@@ -63,6 +63,15 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
 
 	b47s->bcma_cc = container_of(sflash, struct bcma_drv_cc, sflash);
 
+	switch (b47s->bcma_cc->capabilities & BCMA_CC_CAP_FLASHT) {
+	case BCMA_CC_FLASHT_STSER:
+		b47s->type = BCM47XXSFLASH_TYPE_ST;
+		break;
+	case BCMA_CC_FLASHT_ATSER:
+		b47s->type = BCM47XXSFLASH_TYPE_ATMEL;
+		break;
+	}
+
 	b47s->window = sflash->window;
 	b47s->blocksize = sflash->blocksize;
 	b47s->numblocks = sflash->numblocks;
diff --git a/trunk/drivers/mtd/devices/bcm47xxsflash.h b/trunk/drivers/mtd/devices/bcm47xxsflash.h
index e37285e6fad9..44985294ed8f 100644
--- a/trunk/drivers/mtd/devices/bcm47xxsflash.h
+++ b/trunk/drivers/mtd/devices/bcm47xxsflash.h
@@ -5,9 +5,16 @@
 
 struct bcma_drv_cc;
 
+enum bcm47xxsflash_type {
+	BCM47XXSFLASH_TYPE_ATMEL,
+	BCM47XXSFLASH_TYPE_ST,
+};
+
 struct bcm47xxsflash {
 	struct bcma_drv_cc *bcma_cc;
 
+	enum bcm47xxsflash_type type;
+
 	u32 window;
 	u32 blocksize;
 	u16 numblocks;