svn commit: r273695 - stable/10/sys/arm/arm

[Ian Lepore]

Author: ian
Date: Sun Oct 26 16:09:59 2014
New Revision: 273695
URL: https://svnweb.freebsd.org/changeset/base/273695

Log:
  MFC r273590: Accept documented compatible string for PL310 cache controller/

Modified:
  stable/10/sys/arm/arm/pl310.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/arm/pl310.c
==============================================================================
--- stable/10/sys/arm/arm/pl310.c	Sun Oct 26 16:02:35 2014	(r273694)
+++ stable/10/sys/arm/arm/pl310.c	Sun Oct 26 16:09:59 2014	(r273695)
@@ -84,6 +84,12 @@ static uint32_t g_ways_assoc;
 
 static struct pl310_softc *pl310_softc;
 
+static struct ofw_compat_data compat_data[] = {
+	{"arm,pl310",		true}, /* Non-standard, FreeBSD. */
+	{"arm,pl310-cache",	true},
+	{NULL,			false}
+};
+
 void
 pl310_print_config(struct pl310_softc *sc)
 {
@@ -422,8 +428,7 @@ pl310_probe(device_t dev)
 	
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
-
-	if (!ofw_bus_is_compatible(dev, "arm,pl310"))
+	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
 		return (ENXIO);
 	device_set_desc(dev, "PL310 L2 cache controller");
 	return (0);