From owner-svn-src-head@FreeBSD.ORG  Sun Jan 30 12:14:06 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F40B1065670;
	Sun, 30 Jan 2011 12:14:06 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FA378FC0C;
	Sun, 30 Jan 2011 12:14:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0UCE6Dm071209;
	Sun, 30 Jan 2011 12:14:06 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UCE6IL071207;
	Sun, 30 Jan 2011 12:14:06 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201101301214.p0UCE6IL071207@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 30 Jan 2011 12:14:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218088 - head/sys/dev/flash
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jan 2011 12:14:06 -0000

Author: adrian
Date: Sun Jan 30 12:14:06 2011
New Revision: 218088
URL: http://svn.freebsd.org/changeset/base/218088

Log:
  Add support for the m25p64; lifted straight from Linux.
  
  This flash chip is found on the Ubiquiti LS-SR71 board.
  I've successfully tested reading; I've not tried writing to it yet.

Modified:
  head/sys/dev/flash/mx25l.c

Modified: head/sys/dev/flash/mx25l.c
==============================================================================
--- head/sys/dev/flash/mx25l.c	Sun Jan 30 12:12:25 2011	(r218087)
+++ head/sys/dev/flash/mx25l.c	Sun Jan 30 12:14:06 2011	(r218088)
@@ -90,6 +90,7 @@ static void mx25l_task(void *arg);
 
 struct mx25l_flash_ident flash_devices[] = {
 	{ "mx25ll32",  0xc2, 0x2016, 64 * 1024,  64, FL_NONE },
+	{ "m25p64",    0x20, 0x2017, 64 * 1024, 128, FL_NONE },
 	{ "mx25ll64",  0xc2, 0x2017, 64 * 1024, 128, FL_NONE },
 	{ "mx25ll128", 0xc2, 0x2018, 64 * 1024, 256, FL_ERASE_4K | FL_ERASE_32K },
 	{ "s25fl128",  0x01, 0x2018, 64 * 1024, 256, FL_NONE },