X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fmtd%2Fspi%2Fsst.c;h=256867c84481f1238de91a907b829369020efe43;hb=cc734f5ab26134e5e8d57c34edc257c89ac5b1d2;hp=4dc2db2ba7b83e4aa269b42780fa939f109b8702;hpb=9dd5dad88777a7c6a63f8c103706b57364a135f4;p=karo-tx-uboot.git

diff --git a/drivers/mtd/spi/sst.c b/drivers/mtd/spi/sst.c
index 4dc2db2ba7..256867c844 100644
--- a/drivers/mtd/spi/sst.c
+++ b/drivers/mtd/spi/sst.c
@@ -18,15 +18,8 @@
 
 #include "spi_flash_internal.h"
 
-#define CMD_SST_WREN		0x06	/* Write Enable */
-#define CMD_SST_WRDI		0x04	/* Write Disable */
-#define CMD_SST_RDSR		0x05	/* Read Status Register */
-#define CMD_SST_WRSR		0x01	/* Write Status Register */
-#define CMD_SST_READ		0x03	/* Read Data Bytes */
-#define CMD_SST_FAST_READ	0x0b	/* Read Data Bytes at Higher Speed */
 #define CMD_SST_BP		0x02	/* Byte Program */
-#define CMD_SST_AAI_WP		0xAD	/* Auto Address Increment Word Program */
-#define CMD_SST_SE		0x20	/* Sector Erase */
+#define CMD_SST_AAI_WP		0xAD	/* Auto Address Incr Word Program */
 
 #define SST_SR_WIP		(1 << 0)	/* Write-in-Progress */
 #define SST_SR_WEL		(1 << 1)	/* Write enable */
@@ -36,8 +29,12 @@
 #define SST_SR_AAI		(1 << 6)	/* Addressing mode */
 #define SST_SR_BPL		(1 << 7)	/* BP bits lock */
 
+#define SST_FEAT_WP		(1 << 0)	/* Supports AAI word program */
+#define SST_FEAT_MBP		(1 << 1)	/* Supports multibyte program */
+
 struct sst_spi_flash_params {
 	u8 idcode1;
+	u8 flags;
 	u16 nr_sectors;
 	const char *name;
 };
@@ -47,70 +44,69 @@ struct sst_spi_flash {
 	const struct sst_spi_flash_params *params;
 };
 
-static inline struct sst_spi_flash *to_sst_spi_flash(struct spi_flash *flash)
-{
-	return container_of(flash, struct sst_spi_flash, flash);
-}
-
-#define SST_SECTOR_SIZE (4 * 1024)
 static const struct sst_spi_flash_params sst_spi_flash_table[] = {
 	{
 		.idcode1 = 0x8d,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 128,
 		.name = "SST25VF040B",
-	},{
+	},
+	{
 		.idcode1 = 0x8e,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 256,
 		.name = "SST25VF080B",
-	},{
+	},
+	{
 		.idcode1 = 0x41,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 512,
 		.name = "SST25VF016B",
-	},{
+	},
+	{
 		.idcode1 = 0x4a,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 1024,
 		.name = "SST25VF032B",
-	},{
+	},
+	{
 		.idcode1 = 0x4b,
+		.flags = SST_FEAT_MBP,
 		.nr_sectors = 2048,
 		.name = "SST25VF064C",
-	},{
+	},
+	{
 		.idcode1 = 0x01,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 16,
 		.name = "SST25WF512",
-	},{
+	},
+	{
 		.idcode1 = 0x02,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 32,
 		.name = "SST25WF010",
-	},{
+	},
+	{
 		.idcode1 = 0x03,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 64,
 		.name = "SST25WF020",
-	},{
+	},
+	{
 		.idcode1 = 0x04,
+		.flags = SST_FEAT_WP,
 		.nr_sectors = 128,
 		.name = "SST25WF040",
 	},
+	{
+		.idcode1 = 0x05,
+		.flags = SST_FEAT_WP,
+		.nr_sectors = 256,
+		.name = "SST25WF080",
+	},
 };
 
-static int
-sst_enable_writing(struct spi_flash *flash)
-{
-	int ret = spi_flash_cmd(flash->spi, CMD_SST_WREN, NULL, 0);
-	if (ret)
-		debug("SF: Enabling Write failed\n");
-	return ret;
-}
-
-static int
-sst_disable_writing(struct spi_flash *flash)
-{
-	int ret = spi_flash_cmd(flash->spi, CMD_SST_WRDI, NULL, 0);
-	if (ret)
-		debug("SF: Disabling Write failed\n");
-	return ret;
-}
-
 static int
 sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 {
@@ -123,9 +119,9 @@ sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 	};
 
 	debug("BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-		spi_w8r8(flash->spi, CMD_SST_RDSR), buf, cmd[0], offset);
+	      spi_w8r8(flash->spi, CMD_READ_STATUS), buf, cmd[0], offset);
 
-	ret = sst_enable_writing(flash);
+	ret = spi_flash_cmd_write_enable(flash);
 	if (ret)
 		return ret;
 
@@ -137,7 +133,7 @@ sst_byte_write(struct spi_flash *flash, u32 offset, const void *buf)
 }
 
 static int
-sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
+sst_write_wp(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 {
 	size_t actual, cmd_len;
 	int ret;
@@ -158,7 +154,7 @@ sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 	}
 	offset += actual;
 
-	ret = sst_enable_writing(flash);
+	ret = spi_flash_cmd_write_enable(flash);
 	if (ret)
 		goto done;
 
@@ -170,11 +166,11 @@ sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 
 	for (; actual < len - 1; actual += 2) {
 		debug("WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
-		     spi_w8r8(flash->spi, CMD_SST_RDSR), buf + actual, cmd[0],
-		     offset);
+		      spi_w8r8(flash->spi, CMD_READ_STATUS), buf + actual,
+		      cmd[0], offset);
 
 		ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len,
-		                          buf + actual, 2);
+					buf + actual, 2);
 		if (ret) {
 			debug("SF: sst word program failed\n");
 			break;
@@ -189,7 +185,7 @@ sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 	}
 
 	if (!ret)
-		ret = sst_disable_writing(flash);
+		ret = spi_flash_cmd_write_disable(flash);
 
 	/* If there is a single trailing byte, write it out */
 	if (!ret && actual != len)
@@ -203,32 +199,6 @@ sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
 	return ret;
 }
 
-static int sst_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-	return spi_flash_cmd_erase(flash, CMD_SST_SE, offset, len);
-}
-
-static int
-sst_unlock(struct spi_flash *flash)
-{
-	int ret;
-	u8 cmd, status;
-
-	ret = sst_enable_writing(flash);
-	if (ret)
-		return ret;
-
-	cmd = CMD_SST_WRSR;
-	status = 0;
-	ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &status, 1);
-	if (ret)
-		debug("SF: Unable to set status byte\n");
-
-	debug("SF: sst: status = %x\n", spi_w8r8(flash->spi, CMD_SST_RDSR));
-
-	return ret;
-}
-
 struct spi_flash *
 spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
 {
@@ -247,24 +217,22 @@ spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
 		return NULL;
 	}
 
-	stm = malloc(sizeof(*stm));
+	stm = spi_flash_alloc(struct sst_spi_flash, spi, params->name);
 	if (!stm) {
 		debug("SF: Failed to allocate memory\n");
 		return NULL;
 	}
 
 	stm->params = params;
-	stm->flash.spi = spi;
-	stm->flash.name = params->name;
 
-	stm->flash.write = sst_write;
-	stm->flash.erase = sst_erase;
-	stm->flash.read = spi_flash_cmd_read_fast;
-	stm->flash.sector_size = SST_SECTOR_SIZE;
+	if (stm->params->flags & SST_FEAT_WP)
+		stm->flash.write = sst_write_wp;
+	stm->flash.page_size = 256;
+	stm->flash.sector_size = 4096;
 	stm->flash.size = stm->flash.sector_size * params->nr_sectors;
 
 	/* Flash powers up read-only, so clear BP# bits */
-	sst_unlock(&stm->flash);
+	spi_flash_cmd_write_status(&stm->flash, 0);
 
 	return &stm->flash;
 }