diff options
author | Brian Norris <computersforpeace@gmail.com> | 2013-02-22 17:07:22 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 07:04:45 -0400 |
commit | e66e280c36e09e4573089862e7dc2ade9e680088 (patch) | |
tree | 0880b9b3793fab73a8ac36198370473e6cefc953 /drivers/mtd/devices | |
parent | b5a6c3095f0b8c69b1e5c4bacb7ee13069f2688d (diff) |
mtd: m25p80: n25q064 is Micron, not Intel/Numonyx
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r-- | drivers/mtd/devices/m25p80.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index fcdcfc77b1b7..45f143ac5b93 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
@@ -741,7 +741,6 @@ static const struct spi_device_id m25p_ids[] = { | |||
741 | { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, | 741 | { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) }, |
742 | { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) }, | 742 | { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) }, |
743 | { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) }, | 743 | { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) }, |
744 | { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, 0) }, | ||
745 | 744 | ||
746 | /* Macronix */ | 745 | /* Macronix */ |
747 | { "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) }, | 746 | { "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) }, |
@@ -757,6 +756,7 @@ static const struct spi_device_id m25p_ids[] = { | |||
757 | { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, 0) }, | 756 | { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, 0) }, |
758 | 757 | ||
759 | /* Micron */ | 758 | /* Micron */ |
759 | { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, 0) }, | ||
760 | { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, 0) }, | 760 | { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, 0) }, |
761 | { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, 0) }, | 761 | { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, 0) }, |
762 | { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) }, | 762 | { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) }, |