From owner-svn-src-head@FreeBSD.ORG  Mon Mar 28 11:08:59 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2C84C1065676;
	Mon, 28 Mar 2011 11:08:59 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 195188FC2A;
	Mon, 28 Mar 2011 11:08:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2SB8w47092607;
	Mon, 28 Mar 2011 11:08:58 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2SB8w9w092605;
	Mon, 28 Mar 2011 11:08:58 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201103281108.p2SB8w9w092605@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 28 Mar 2011 11:08:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220097 - head/sys/dev/mvs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Mar 2011 11:08:59 -0000

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