The patch titled
mtd-sst25l-non-jedec-spi-flash-driver-update
has been removed from the -mm tree. Its filename was
mtd-sst25l-non-jedec-spi-flash-driver-update.patch
This patch was dropped because it was folded into mtd-sst25l-non-jedec-spi-flash-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mtd-sst25l-non-jedec-spi-flash-driver-update
From: Ryan Mallon <ryan@xxxxxxxxxxxxxxxx>
The updated patch below uses sector erases instead to allow for smaller
partition sizes.
Signed-off-by: Andre Renaud <andre@xxxxxxxxxxxxxxxx>
Signed-off-by: Ryan Mallon <ryan@xxxxxxxxxxxxxxxx>
Cc: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mtd/devices/sst25l.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/mtd/devices/sst25l.c~mtd-sst25l-non-jedec-spi-flash-driver-update drivers/mtd/devices/sst25l.c
--- a/drivers/mtd/devices/sst25l.c~mtd-sst25l-non-jedec-spi-flash-driver-update
+++ a/drivers/mtd/devices/sst25l.c
@@ -37,7 +37,7 @@
#define SST25L_CMD_READ 0x03 /* High speed read */
#define SST25L_CMD_EWSR 0x50 /* Enable write status register */
-#define SST25L_CMD_BLOCK_ERASE 0x52 /* Erase sector */
+#define SST25L_CMD_SECTOR_ERASE 0x20 /* Erase sector */
#define SST25L_CMD_READ_ID 0x90 /* Read device ID */
#define SST25L_CMD_AAI_PROGRAM 0xaf /* Auto address increment */
@@ -65,8 +65,8 @@ struct flash_info {
#define to_sst25l_flash(x) container_of(x, struct sst25l_flash, mtd)
static struct flash_info __initdata sst25l_flash_info[] = {
- {"sst25lf020a", 0xbf43, 256, 1024, 32 * 1024},
- {"sst25lf040a", 0xbf44, 256, 2048, 32 * 1024},
+ {"sst25lf020a", 0xbf43, 256, 1024, 4096},
+ {"sst25lf040a", 0xbf44, 256, 2048, 4096},
};
static int sst25l_status(struct sst25l_flash *flash, int *status)
@@ -134,7 +134,7 @@ static int sst25l_wait_till_ready(struct
return -ETIMEDOUT;
}
-static int sst25l_erase_block(struct sst25l_flash *flash, u32 offset)
+static int sst25l_erase_sector(struct sst25l_flash *flash, u32 offset)
{
u8 command[4];
int err;
@@ -143,7 +143,7 @@ static int sst25l_erase_block(struct sst
if (err)
return err;
- command[0] = SST25L_CMD_BLOCK_ERASE;
+ command[0] = SST25L_CMD_SECTOR_ERASE;
command[1] = offset >> 16;
command[2] = offset >> 8;
command[3] = offset;
@@ -184,7 +184,7 @@ static int sst25l_erase(struct mtd_info
return err;
while (addr < end) {
- err = sst25l_erase_block(flash, addr);
+ err = sst25l_erase_sector(flash, addr);
if (err) {
mutex_unlock(&flash->lock);
instr->state = MTD_ERASE_FAILED;
_
Patches currently in -mm which might be from ryan@xxxxxxxxxxxxxxxx are
linux-next.patch
mtd-sst25l-non-jedec-spi-flash-driver.patch
mtd-sst25l-non-jedec-spi-flash-driver-update.patch
mtd-sst25l-non-jedec-spi-flash-driver-fix.patch
ep93xx-video-driver-platform-support.patch
ep93xx-video-driver.patch
ep93xx-video-driver-documentation.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
