From owner-svn-src-all@FreeBSD.ORG  Mon Oct 28 07:18:25 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7F0B7C75;
 Mon, 28 Oct 2013 07:18:25 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6C8F0272E;
 Mon, 28 Oct 2013 07:18:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9S7IPmP037823;
 Mon, 28 Oct 2013 07:18:25 GMT (envelope-from zbb@svn.freebsd.org)
Received: (from zbb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9S7IP20037819;
 Mon, 28 Oct 2013 07:18:25 GMT (envelope-from zbb@svn.freebsd.org)
Message-Id: <201310280718.r9S7IP20037819@svn.freebsd.org>
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Mon, 28 Oct 2013 07:18:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257240 - in head/sys: arm/conf dev/mvs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 07:18:25 -0000

Author: zbb
Date: Mon Oct 28 07:18:24 2013
New Revision: 257240
URL: http://svnweb.freebsd.org/changeset/base/257240

Log:
  Run mvs SATA driver on Armada XP instead of old mv_sata
  
  The mvs driver seems to be more functional than mv_sata and is not
  causing random interrupt storms during boot.

Modified:
  head/sys/arm/conf/ARMADAXP
  head/sys/dev/mvs/mvs_soc.c

Modified: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP	Mon Oct 28 05:55:47 2013	(r257239)
+++ head/sys/arm/conf/ARMADAXP	Mon Oct 28 07:18:24 2013	(r257240)
@@ -76,8 +76,7 @@ device		pass
 device		da
 
 # SATA
-device		ata
-#device		mvs
+device		mvs
 
 # Serial ports
 device		uart

Modified: head/sys/dev/mvs/mvs_soc.c
==============================================================================
--- head/sys/dev/mvs/mvs_soc.c	Mon Oct 28 05:55:47 2013	(r257239)
+++ head/sys/dev/mvs/mvs_soc.c	Mon Oct 28 07:18:24 2013	(r257240)
@@ -66,6 +66,8 @@ static struct {
 	{MV_DEV_88F6282, 0x00,   "Marvell 88F6282",	2, MVS_Q_GENIIE|MVS_Q_SOC},
 	{MV_DEV_MV78100, 0x00,   "Marvell MV78100",	2, MVS_Q_GENIIE|MVS_Q_SOC},
 	{MV_DEV_MV78100_Z0, 0x00,"Marvell MV78100",	2, MVS_Q_GENIIE|MVS_Q_SOC},
+	{MV_DEV_MV78260, 0x00,   "Marvell MV78260",	2, MVS_Q_GENIIE|MVS_Q_SOC},
+	{MV_DEV_MV78460, 0x00,   "Marvell MV78460",	2, MVS_Q_GENIIE|MVS_Q_SOC},
 	{0,              0x00,   NULL,			0, 0}
 };