From owner-svn-src-head@FreeBSD.ORG  Sat Jun  8 20:12:14 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BAB825EA;
 Sat,  8 Jun 2013 20:12:14 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AD26A122A;
 Sat,  8 Jun 2013 20:12:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58KCEhE093699;
 Sat, 8 Jun 2013 20:12:14 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58KCESw093698;
 Sat, 8 Jun 2013 20:12:14 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306082012.r58KCESw093698@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 8 Jun 2013 20:12:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251550 - head/sys/dev/flash
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 08 Jun 2013 20:12:14 -0000

Author: adrian
Date: Sat Jun  8 20:12:14 2013
New Revision: 251550
URL: http://svnweb.freebsd.org/changeset/base/251550

Log:
  Add support for two new winbond SPI flash parts.
  
  The 8devices carambola 2 board uses the 16MB part.
  
  Here's how it looks:
  
  spibus0: <spibus bus> on spi0
  mx25l0: <M25Pxx Flash Family> at cs 0 on spibus0
  mx25l0: w25q128, sector 65536 bytes, 256 sectors
  
  Tested:
  
  * 8devices Carambola 2 board

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

Modified: head/sys/dev/flash/mx25l.c
==============================================================================
--- head/sys/dev/flash/mx25l.c	Sat Jun  8 19:13:49 2013	(r251549)
+++ head/sys/dev/flash/mx25l.c	Sat Jun  8 20:12:14 2013	(r251550)
@@ -108,10 +108,14 @@ struct mx25l_flash_ident flash_devices[]
 	{ "s25s1032",	0x01, 0x0215, 64 * 1024, 64, FL_NONE },
 	{ "s25sl064a",	0x01, 0x0216, 64 * 1024, 128, FL_NONE },
 	{ "SST25VF032B", 0xbf, 0x254a, 64 * 1024, 64, FL_ERASE_4K | FL_ERASE_32K },
+
+	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
+	{ "w25x32",	0xef, 0x3016, 64 * 1024, 64, FL_ERASE_4K },
 	{ "w25q32",	0xef, 0x4016, 64 * 1024, 64, FL_ERASE_4K },
 	{ "w25q64",	0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
 	{ "w25q64bv",	0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
-	{ "w25x32",	0xef, 0x3016, 64 * 1024, 64, FL_ERASE_4K },
+	{ "w25q128",	0xef, 0x4018, 64 * 1024, 256, FL_ERASE_4K },
+	{ "w25q256",	0xef, 0x4019, 64 * 1024, 512, FL_ERASE_4K },
 };
 
 static uint8_t