Date: Fri, 24 Oct 2014 15:44:30 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273590 - head/sys/arm/arm Message-ID: <201410241544.s9OFiUZP088923@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri Oct 24 15:44:29 2014 New Revision: 273590 URL: https://svnweb.freebsd.org/changeset/base/273590 Log: Accept the documented FDT compatible string for the PL310 cache controller as well as the non-standard string we've been using for a couple years. Modified: head/sys/arm/arm/pl310.c Modified: head/sys/arm/arm/pl310.c ============================================================================== --- head/sys/arm/arm/pl310.c Fri Oct 24 15:36:30 2014 (r273589) +++ head/sys/arm/arm/pl310.c Fri Oct 24 15:44:29 2014 (r273590) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410241544.s9OFiUZP088923>