svn commit: r257240 - in head/sys: arm/conf dev/mvs

[Zbigniew Bodek]

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}
 };