mtd: m25p80: n25q064 is Micron, not Intel/Numonyx

Submitted by Brian Norris on Feb. 22, 2013, 10:07 p.m.

Details

Message ID 1361570842-6442-1-git-send-email-computersforpeace@gmail.com
State Accepted
Headers show

Commit Message

Brian Norris Feb. 22, 2013, 10:07 p.m.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 drivers/mtd/devices/m25p80.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Korsgaard Feb. 22, 2013, 10:19 p.m.
>>>>> "Brian" == Brian Norris <computersforpeace@gmail.com> writes:

 Brian> Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Brian Norris Feb. 22, 2013, 11:43 p.m.
2013/2/22 Peter Korsgaard <jacmet@sunsite.dk>:
>>>>>> "Brian" == Brian Norris <computersforpeace@gmail.com> writes:
>
>  Brian> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
>
> Acked-by: Peter Korsgaard <jacmet@sunsite.dk>

BTW, I neglected to mention: the datasheet I have actually says
Numonyx, but it has been integrated into the Micron line, and the ID
follows the Micron pattern. So it makes sense to file this under the
Micron ID section.

Brian
Artem Bityutskiy March 8, 2013, 12:01 p.m.
On Fri, 2013-02-22 at 14:07 -0800, Brian Norris wrote:
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Pushed to l2-mtd.git, thanks!

Patch hide | download patch | download mbox

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 5b6b072..ae3c8c6 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -740,7 +740,6 @@  static const struct spi_device_id m25p_ids[] = {
 	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
 	{ "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
 	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
-	{ "n25q064",  INFO(0x20ba17, 0, 64 * 1024, 128, 0) },
 
 	/* Macronix */
 	{ "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },
@@ -755,6 +754,7 @@  static const struct spi_device_id m25p_ids[] = {
 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
 
 	/* Micron */
+	{ "n25q064",  INFO(0x20ba17, 0, 64 * 1024, 128, 0) },
 	{ "n25q128a11",  INFO(0x20bb18, 0, 64 * 1024, 256, 0) },
 	{ "n25q128a13",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
 	{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },