from:"jimkuo"

[PATCH] m25p80: Add support of Macronix SPI flash

2012-10-10 Thread jimkuo


Hello,
I'm an engineer of Macronix. I just verified our serial nor flashes with
Linux m25p80 driver.
Could you please commit the changes to next version of Linux?

I replace the old JEDEC id with our new product's.
Two of our products have different page size, so I add the "if statement"
before page size assignment.
The following is my patch which diff from Linux-3.6 kernel. Thank you!
---

--- drivers/mtd/devices/m25p80.c.orig 2012-09-28 11:29:03.391552000
+0800
+++ drivers/mtd/devices/m25p80.c2012-09-28 14:27:42.470208000 +0800
@@ -648,13 +648,31 @@ static const struct spi_device_id m25p_i
  { "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },

  /* Macronix */
- { "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
- { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
- { "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
- { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
- { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
- { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+ { "mx25l512e",   INFO(0xc22010, 0, 64 * 1024,   1, SECT_4K) },
+ { "mx25l5121e",  INFO(0xc22210, 0, 64 * 1024,   1, SECT_4K) },
+ { "mx25l1006e",  INFO(0xc22011, 0, 64 * 1024,   2, SECT_4K) },
+ { "mx25l1021e",  INFO(0xc22211, 0, 64 * 1024,   2, SECT_4K) },
+ { "mx25l2006e",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
+ { "mx25l4006e",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25u4035",   INFO(0xc22533, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25v4035",   INFO(0xc22553, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25l8006e",  INFO(0xc22014, 0, 64 * 1024,  16, 0) },
+ { "mx25u8035",   INFO(0xc22534, 0, 64 * 1024,  16, 0) },
+ { "mx25v8035",   INFO(0xc22554, 0, 64 * 1024,  16, 0) },
+ { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, 0) },
+ { "mx25l1633e",  INFO(0xc22415, 0, 64 * 1024,  32, 0) },
+ { "mx25l1635e",  INFO(0xc22515, 0, 64 * 1024,  32, 0) },
+ { "mx25u1635e",  INFO(0xc22535, 0, 64 * 1024,  32, 0) },
+ { "mx25l1655d",  INFO(0xc22615, 0, 64 * 1024,  32, 0) },
+ { "mx25l3206e",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
+ { "mx25l3239e",  INFO(0xc22536, 0, 64 * 1024,  64, 0) },
+ { "mx25l3225d",  INFO(0xc25e16, 0, 64 * 1024,  64, 0) },
+ { "mx25l3255d",  INFO(0xc29e16, 0, 64 * 1024,  64, 0) },
+ { "mx25l6406e",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
+ { "mx25l6439e",  INFO(0xc22537, 0, 64 * 1024, 128, 0) },
+ { "mx25l6455e",  INFO(0xc22617, 0, 64 * 1024, 128, 0) },
+ { "mx25l12806e", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+ { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256, 0) },
  { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
  { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
  { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
@@ -905,7 +923,11 @@ static int __devinit m25p_probe(struct s

  ppdata.of_node = spi->dev.of_node;
  flash->mtd.dev.parent = &spi->dev;
- flash->page_size = info->page_size;
+ /* small size page of Macronix chip */
+ if (info->jedec_id == 0xc22210 || info->jedec_id == 0xc22211)
+   flash->page_size = 32;
+ else
+   flash->page_size = info->page_size;
  flash->mtd.writebufsize = flash->page_size;

  if (info->addr_width)

--





CONFIDENTIALITY NOTE:

This e-mail and any attachments may contain confidential information and may be 
protected by legal privilege. If you are not the intended addressee (or 
authorized to receive for the addressee), be aware that any disclosure, 
copying, distribution or use of this e-mail or any attachment is prohibited. If 
you have received this e-mail in error, please notify us immediately by 
returning it to the sender and delete this copy from your system. Thank you for 
your cooperation.

Macronix International Co., Ltd.

=

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2] m25p80: Add support of Macronix SPI flash

2012-10-18 Thread jimkuo


Hello,
I'm an engineer of Macronix. I have sent you a m25p80 patch few weeks ago.
This is an update version of that one.

I replaced the old jedec id with our new product's. And add "write enable"
feature to our chips.
Two of our products have different page size, so I add an "if statement"
before page size assignment.
The following is m25p80 patch "diff" from Linux-3.6 kernel:
--

--- drivers/mtd/devices/m25p80.c.orig 2012-10-19 10:10:36.017581000
+0800
+++ drivers/mtd/devices/m25p80.c2012-10-19 10:14:55.294198000 +0800
@@ -648,13 +648,31 @@ static const struct spi_device_id m25p_i
  { "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },

  /* Macronix */
- { "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
- { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
- { "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
- { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
- { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
- { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+ { "mx25l512e",   INFO(0xc22010, 0, 64 * 1024,   1, SECT_4K) },
+ { "mx25l5121e",  INFO(0xc22210, 0, 64 * 1024,   1, SECT_4K) },
+ { "mx25l1006e",  INFO(0xc22011, 0, 64 * 1024,   2, SECT_4K) },
+ { "mx25l1021e",  INFO(0xc22211, 0, 64 * 1024,   2, SECT_4K) },
+ { "mx25l2006e",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
+ { "mx25l4006e",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25u4035",   INFO(0xc22533, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25v4035",   INFO(0xc22553, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25l8006e",  INFO(0xc22014, 0, 64 * 1024,  16, 0) },
+ { "mx25u8035",   INFO(0xc22534, 0, 64 * 1024,  16, 0) },
+ { "mx25v8035",   INFO(0xc22554, 0, 64 * 1024,  16, 0) },
+ { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, 0) },
+ { "mx25l1633e",  INFO(0xc22415, 0, 64 * 1024,  32, 0) },
+ { "mx25l1635e",  INFO(0xc22515, 0, 64 * 1024,  32, 0) },
+ { "mx25u1635e",  INFO(0xc22535, 0, 64 * 1024,  32, 0) },
+ { "mx25l1655d",  INFO(0xc22615, 0, 64 * 1024,  32, 0) },
+ { "mx25l3206e",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
+ { "mx25l3239e",  INFO(0xc22536, 0, 64 * 1024,  64, 0) },
+ { "mx25l3225d",  INFO(0xc25e16, 0, 64 * 1024,  64, 0) },
+ { "mx25l3255d",  INFO(0xc29e16, 0, 64 * 1024,  64, 0) },
+ { "mx25l6406e",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
+ { "mx25l6439e",  INFO(0xc22537, 0, 64 * 1024, 128, 0) },
+ { "mx25l6455e",  INFO(0xc22617, 0, 64 * 1024, 128, 0) },
+ { "mx25l12806e", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+ { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256, 0) },
  { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
  { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
  { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
@@ -868,7 +886,8 @@ static int __devinit m25p_probe(struct s

  if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
  JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
- JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_SST ||
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX) {
write_enable(flash);
write_sr(flash, 0);
  }
@@ -905,7 +924,11 @@ static int __devinit m25p_probe(struct s

  ppdata.of_node = spi->dev.of_node;
  flash->mtd.dev.parent = &spi->dev;
- flash->page_size = info->page_size;
+ /* small size page of Macronix chip */
+ if (info->jedec_id == 0xc22210 || info->jedec_id == 0xc22211)
+   flash->page_size = 32;
+ else
+   flash->page_size = info->page_size;
  flash->mtd.writebufsize = flash->page_size;

  if (info->addr_width)

--





CONFIDENTIALITY NOTE:

This e-mail and any attachments may contain confidential information and may be 
protected by legal privilege. If you are not the intended addressee (or 
authorized to receive for the addressee), be aware that any disclosure, 
copying, distribution or use of this e-mail or any attachment is prohibited. If 
you have received this e-mail in error, please notify us immediately by 
returning it to the sender and delete this copy from your system. Thank you for 
your cooperation.

Macronix International Co., Ltd.

=

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/1] m25p80: add JEDEC id and reset SR for Macronix devices

2013-01-03 Thread jimkuo


From: Mike Lavender 

The following modification is based on Linux-3.8-rc1.
I changed and added some JEDEC id of Macronix devices to "m25p_ids" array.
And I set status register to 0 at startup time for using some type of
Macronix device.
Signed-off-by: Jim Kuo 
---
diff -uprN a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
--- a/drivers/mtd/devices/m25p80.c  2013-01-03 14:48:03.250938000 +0800
+++ b/drivers/mtd/devices/m25p80.c  2013-01-03 14:55:14.364119000 +0800
@@ -649,13 +649,31 @@ static const struct spi_device_id m25p_i
  { "n25q064",  INFO(0x20ba17, 0, 64 * 1024, 128, 0) },

  /* Macronix */
- { "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
- { "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
- { "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
- { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
- { "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
- { "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+ { "mx25l512e",   INFO(0xc22010, 0, 64 * 1024,   1, SECT_4K) },
+ { "mx25l5121e",  INFO(0xc22210, 0, 64 * 1024,   1, SECT_4K) },
+ { "mx25l1006e",  INFO(0xc22011, 0, 64 * 1024,   2, SECT_4K) },
+ { "mx25l1021e",  INFO(0xc22211, 0, 64 * 1024,   2, SECT_4K) },
+ { "mx25l2006e",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
+ { "mx25l4006e",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25u4035",   INFO(0xc22533, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25v4035",   INFO(0xc22553, 0, 64 * 1024,   8, SECT_4K) },
+ { "mx25l8006e",  INFO(0xc22014, 0, 64 * 1024,  16, 0) },
+ { "mx25u8035",   INFO(0xc22534, 0, 64 * 1024,  16, 0) },
+ { "mx25v8035",   INFO(0xc22554, 0, 64 * 1024,  16, 0) },
+ { "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, 0) },
+ { "mx25l1633e",  INFO(0xc22415, 0, 64 * 1024,  32, 0) },
+ { "mx25l1635e",  INFO(0xc22515, 0, 64 * 1024,  32, 0) },
+ { "mx25u1635e",  INFO(0xc22535, 0, 64 * 1024,  32, 0) },
+ { "mx25l1655d",  INFO(0xc22615, 0, 64 * 1024,  32, 0) },
+ { "mx25l3206e",  INFO(0xc22016, 0, 64 * 1024,  64, 0) },
+ { "mx25l3239e",  INFO(0xc22536, 0, 64 * 1024,  64, 0) },
+ { "mx25l3225d",  INFO(0xc25e16, 0, 64 * 1024,  64, 0) },
+ { "mx25l3255d",  INFO(0xc29e16, 0, 64 * 1024,  64, 0) },
+ { "mx25l6406e",  INFO(0xc22017, 0, 64 * 1024, 128, 0) },
+ { "mx25l6439e",  INFO(0xc22537, 0, 64 * 1024, 128, 0) },
+ { "mx25l6455e",  INFO(0xc22617, 0, 64 * 1024, 128, 0) },
+ { "mx25l12806e", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
+ { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256, 0) },
  { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
  { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
  { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
@@ -876,13 +894,14 @@ static int m25p_probe(struct spi_device
  dev_set_drvdata(&spi->dev, flash);

  /*
-  * Atmel, SST and Intel/Numonyx serial flash tend to power
-  * up with the software protection bits set
+  * Atmel, SST, Intel/Numonyx and Macronix serial flash tend
+  * to power up with the software protection bits set
   */

  if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
  JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
- JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_SST   ||
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX) {
write_enable(flash);
write_sr(flash, 0);
  }





CONFIDENTIALITY NOTE:

This e-mail and any attachments may contain confidential information and may be 
protected by legal privilege. If you are not the intended addressee (or 
authorized to receive for the addressee), be aware that any disclosure, 
copying, distribution or use of this e-mail or any attachment is prohibited. If 
you have received this e-mail in error, please notify us immediately by 
returning it to the sender and delete this copy from your system. Thank you for 
your cooperation.

Macronix International Co., Ltd.

=

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] m25p80: Add support of Macronix SPI flash

[PATCH v2] m25p80: Add support of Macronix SPI flash

[PATCH 1/1] m25p80: add JEDEC id and reset SR for Macronix devices

3 matches

Site Navigation

Mail list logo

Footer information