summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzbb <zbb@FreeBSD.org>2013-10-28 07:18:24 +0000
committerzbb <zbb@FreeBSD.org>2013-10-28 07:18:24 +0000
commit7059e9d7d4f6ee34f0ff58a1f972b783f3af7daa (patch)
tree36f389309b7211b79d94f322d423cc06823601f7
parent7e1a7f7ff67c0fe06344372d8c670b569f9ba9fd (diff)
downloadFreeBSD-src-7059e9d7d4f6ee34f0ff58a1f972b783f3af7daa.zip
FreeBSD-src-7059e9d7d4f6ee34f0ff58a1f972b783f3af7daa.tar.gz
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.
-rw-r--r--sys/arm/conf/ARMADAXP3
-rw-r--r--sys/dev/mvs/mvs_soc.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index 50ed7ed..2b49459 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -76,8 +76,7 @@ device pass
device da
# SATA
-device ata
-#device mvs
+device mvs
# Serial ports
device uart
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 2edeef0..ca36993 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -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}
};
OpenPOWER on IntegriCloud