Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Mar 2011 11:08:58 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r220097 - head/sys/dev/mvs
Message-ID:  <201103281108.p2SB8w9w092605@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Mon Mar 28 11:08:58 2011
New Revision: 220097
URL: http://svn.freebsd.org/changeset/base/220097

Log:
  Update mvs(4) driver to work over FDT's simplebus(4) bus.

Modified:
  head/sys/dev/mvs/mvs_soc.c

Modified: head/sys/dev/mvs/mvs_soc.c
==============================================================================
--- head/sys/dev/mvs/mvs_soc.c	Mon Mar 28 09:10:59 2011	(r220096)
+++ head/sys/dev/mvs/mvs_soc.c	Mon Mar 28 11:08:58 2011	(r220097)
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <arm/mv/mvreg.h>
 #include <arm/mv/mvvar.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
 #include "mvs.h"
 
 /* local prototypes */
@@ -73,6 +75,9 @@ mvs_probe(device_t dev)
 	int i;
 	uint32_t devid, revid;
 
+	if (!ofw_bus_is_compatible(dev, "mrvl,sata"))
+		return (ENXIO);
+
 	soc_id(&devid, &revid);
 	for (i = 0; mvs_ids[i].id != 0; i++) {
 		if (mvs_ids[i].id == devid &&
@@ -440,10 +445,10 @@ static device_method_t mvs_methods[] = {
 	{ 0, 0 }
 };
 static driver_t mvs_driver = {
-        "sata",
+        "mvs",
         mvs_methods,
         sizeof(struct mvs_controller)
 };
-DRIVER_MODULE(sata, mbus, mvs_driver, mvs_devclass, 0, 0);
-MODULE_VERSION(sata, 1);
-
+DRIVER_MODULE(mvs, simplebus, mvs_driver, mvs_devclass, 0, 0);
+MODULE_VERSION(mvs, 1);
+MODULE_DEPEND(mvs, cam, 1, 1, 1);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103281108.p2SB8w9w092605>