From owner-svn-src-head@freebsd.org  Wed Jun  8 14:22:17 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED683B6F323;
 Wed,  8 Jun 2016 14:22:17 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BED311F6A;
 Wed,  8 Jun 2016 14:22:17 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58EMGeL059711;
 Wed, 8 Jun 2016 14:22:16 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58EMG6e059708;
 Wed, 8 Jun 2016 14:22:16 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201606081422.u58EMG6e059708@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 8 Jun 2016 14:22:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301632 - in head/sys/dev: flash mii
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.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2016 14:22:18 -0000

Author: bapt
Date: Wed Jun  8 14:22:16 2016
New Revision: 301632
URL: https://svnweb.freebsd.org/changeset/base/301632

Log:
  Add support for Atmel at25df641 flash
  
  Submitted by:	Grégory Soutadé <soutade@gmail.com> (via github pull request)

Modified:
  head/sys/dev/flash/mx25l.c
  head/sys/dev/mii/miidevs
  head/sys/dev/mii/smscphy.c

Modified: head/sys/dev/flash/mx25l.c
==============================================================================
--- head/sys/dev/flash/mx25l.c	Wed Jun  8 14:21:48 2016	(r301631)
+++ head/sys/dev/flash/mx25l.c	Wed Jun  8 14:22:16 2016	(r301632)
@@ -130,6 +130,9 @@ struct mx25l_flash_ident flash_devices[]
 	{ "w25q64bv",	0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
 	{ "w25q128",	0xef, 0x4018, 64 * 1024, 256, FL_ERASE_4K },
 	{ "w25q256",	0xef, 0x4019, 64 * 1024, 512, FL_ERASE_4K },
+
+	 /* Atmel */
+	{ "at25df641",  0x1f, 0x4800, 64 * 1024, 128, FL_ERASE_4K },
 };
 
 static uint8_t

Modified: head/sys/dev/mii/miidevs
==============================================================================
--- head/sys/dev/mii/miidevs	Wed Jun  8 14:21:48 2016	(r301631)
+++ head/sys/dev/mii/miidevs	Wed Jun  8 14:22:16 2016	(r301632)
@@ -343,3 +343,4 @@ model xxXAQTI XMACII		0x0000 XaQti Corp.
 
 /* SMC */
 model SMC LAN8710A		0x000F SMC LAN8710A 10/100 interface
+model SMC LAN8700		0x000C SMC LAN8700  10/100 interface

Modified: head/sys/dev/mii/smscphy.c
==============================================================================
--- head/sys/dev/mii/smscphy.c	Wed Jun  8 14:21:48 2016	(r301631)
+++ head/sys/dev/mii/smscphy.c	Wed Jun  8 14:22:16 2016	(r301632)
@@ -77,6 +77,7 @@ DRIVER_MODULE(smscphy, miibus, smscphy_d
 
 static const struct mii_phydesc smscphys[] = {
 	MII_PHY_DESC(SMC, LAN8710A),
+	MII_PHY_DESC(SMC, LAN8700),
 	MII_PHY_END
 };