diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2013-03-06 06:34:19 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 08:14:14 -0400 |
commit | 1f816bc729fd5dec7c3633b0a54b75dc7a1fea0f (patch) | |
tree | ab58e0d4000de16f5a778e70e755e9d5c6716784 | |
parent | 41c81536ea25d17933b5b503053a5990ec05502a (diff) |
mtd: bcm47xxsflash: store info about flash type
It's going to be needed for erase and write operations, they differ
between Atmel and ST flashes.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r-- | drivers/mtd/devices/bcm47xxsflash.c | 9 | ||||
-rw-r--r-- | drivers/mtd/devices/bcm47xxsflash.h | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c index b0705741fd93..18e7761137a3 100644 --- a/drivers/mtd/devices/bcm47xxsflash.c +++ b/drivers/mtd/devices/bcm47xxsflash.c | |||
@@ -63,6 +63,15 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) | |||
63 | 63 | ||
64 | b47s->bcma_cc = container_of(sflash, struct bcma_drv_cc, sflash); | 64 | b47s->bcma_cc = container_of(sflash, struct bcma_drv_cc, sflash); |
65 | 65 | ||
66 | switch (b47s->bcma_cc->capabilities & BCMA_CC_CAP_FLASHT) { | ||
67 | case BCMA_CC_FLASHT_STSER: | ||
68 | b47s->type = BCM47XXSFLASH_TYPE_ST; | ||
69 | break; | ||
70 | case BCMA_CC_FLASHT_ATSER: | ||
71 | b47s->type = BCM47XXSFLASH_TYPE_ATMEL; | ||
72 | break; | ||
73 | } | ||
74 | |||
66 | b47s->window = sflash->window; | 75 | b47s->window = sflash->window; |
67 | b47s->blocksize = sflash->blocksize; | 76 | b47s->blocksize = sflash->blocksize; |
68 | b47s->numblocks = sflash->numblocks; | 77 | b47s->numblocks = sflash->numblocks; |
diff --git a/drivers/mtd/devices/bcm47xxsflash.h b/drivers/mtd/devices/bcm47xxsflash.h index e37285e6fad9..44985294ed8f 100644 --- a/drivers/mtd/devices/bcm47xxsflash.h +++ b/drivers/mtd/devices/bcm47xxsflash.h | |||
@@ -5,9 +5,16 @@ | |||
5 | 5 | ||
6 | struct bcma_drv_cc; | 6 | struct bcma_drv_cc; |
7 | 7 | ||
8 | enum bcm47xxsflash_type { | ||
9 | BCM47XXSFLASH_TYPE_ATMEL, | ||
10 | BCM47XXSFLASH_TYPE_ST, | ||
11 | }; | ||
12 | |||
8 | struct bcm47xxsflash { | 13 | struct bcm47xxsflash { |
9 | struct bcma_drv_cc *bcma_cc; | 14 | struct bcma_drv_cc *bcma_cc; |
10 | 15 | ||
16 | enum bcm47xxsflash_type type; | ||
17 | |||
11 | u32 window; | 18 | u32 window; |
12 | u32 blocksize; | 19 | u32 blocksize; |
13 | u16 numblocks; | 20 | u16 numblocks; |