From owner-svn-src-all@FreeBSD.ORG Tue Sep 25 22:12:08 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BAF44106566B; Tue, 25 Sep 2012 22:12:08 +0000 (UTC) (envelope-from ray@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8C3758FC0C; Tue, 25 Sep 2012 22:12:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PMC8Oi004229; Tue, 25 Sep 2012 22:12:08 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PMC811004227; Tue, 25 Sep 2012 22:12:08 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201209252212.q8PMC811004227@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 25 Sep 2012 22:12:08 +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: r240939 - head/sys/dev/flash X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 22:12:08 -0000 Author: ray Date: Tue Sep 25 22:12:07 2012 New Revision: 240939 URL: http://svn.freebsd.org/changeset/base/240939 Log: Add more SPI flash IDs. Submitted by: Luiz Otavio O Souza. Submitted by: ZRouter.org project. Approved by: adrian (menthor) Modified: head/sys/dev/flash/mx25l.c Modified: head/sys/dev/flash/mx25l.c ============================================================================== --- head/sys/dev/flash/mx25l.c Tue Sep 25 22:10:14 2012 (r240938) +++ head/sys/dev/flash/mx25l.c Tue Sep 25 22:12:07 2012 (r240939) @@ -96,15 +96,22 @@ static void mx25l_strategy(struct bio *b 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 }, - { "s25s1032", 0x01, 0x0215, 64 * 1024, 64, FL_NONE }, - { "s25sl064a", 0x01, 0x0216, 64 * 1024, 128, FL_NONE }, - { "w25q64bv", 0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K }, - { "w25x32", 0xef, 0x3016, 64 * 1024, 64, FL_ERASE_4K }, + { "en25f32", 0x1c, 0x3116, 64 * 1024, 64, FL_NONE }, + { "en25p32", 0x1c, 0x2016, 64 * 1024, 64, FL_NONE }, + { "en25p64", 0x1c, 0x2017, 64 * 1024, 128, FL_NONE }, + { "en25q64", 0x1c, 0x3017, 64 * 1024, 128, FL_ERASE_4K }, + { "m25p64", 0x20, 0x2017, 64 * 1024, 128, FL_NONE }, + { "mx25ll32", 0xc2, 0x2016, 64 * 1024, 64, 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 }, + { "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 }, + { "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 }, }; static uint8_t