Module Name: src
Committed By: rkujawa
Date: Sun Apr 21 08:38:17 UTC 2013
Modified Files:
src/sys/dev/spi: m25p.c
Log Message:
Add support for STMicro M25PX64 and Numonyx N25Q128.
Obtained from Marvell, Semihalf.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/spi/m25p.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/spi/m25p.c
diff -u src/sys/dev/spi/m25p.c:1.2 src/sys/dev/spi/m25p.c:1.3
--- src/sys/dev/spi/m25p.c:1.2 Sun May 4 14:21:55 2008
+++ src/sys/dev/spi/m25p.c Sun Apr 21 08:38:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: m25p.c,v 1.2 2008/05/04 14:21:55 xtraeme Exp $ */
+/* $NetBSD: m25p.c,v 1.3 2013/04/21 08:38:16 rkujawa Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.2 2008/05/04 14:21:55 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.3 2013/04/21 08:38:16 rkujawa Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,6 +93,8 @@ static const struct m25p_info {
} m25p_infos[] = {
{ 0x16, 0x20, 0x2017, "STMicro M25P64", 8192, 64 }, /* 64Mbit */
{ 0x12, 0x20, 0x2013, "STMicro M25P40", 512, 64 }, /* 4Mbit */
+ { 0xc0, 0x20, 0x7117, "STMicro M25PX64", 8192, 64 }, /* 64Mbit */
+ { 0x0, 0x20, 0xBB18, "Numonyx N25Q128", 16384, 64 }, /* 128Mbit */
{ 0 }
};