svn commit: r290841 - projects/powernv/powerpc/pseries

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Nov 15 03:18:50 2015
New Revision: 290841
URL: https://svnweb.freebsd.org/changeset/base/290841

Log:
  The compatible checks are sufficient here: no need to test the complicated
  "name" property that might have a unit address on the end with an FDT. This
  fixes interrupt routing and lets me boot multiuser on the powernv simulator
  when running as an OPAL payload.
  
  Sponsored by:	FreeBSD Foundation

Modified:
  projects/powernv/powerpc/pseries/xics.c

Modified: projects/powernv/powerpc/pseries/xics.c
==============================================================================
--- projects/powernv/powerpc/pseries/xics.c	Sun Nov 15 03:04:39 2015	(r290840)
+++ projects/powernv/powerpc/pseries/xics.c	Sun Nov 15 03:18:50 2015	(r290841)
@@ -152,9 +152,6 @@ xicp_mem_for_cpu(int cpu)
 static int
 xicp_probe(device_t dev)
 {
-	if (ofw_bus_get_name(dev) == NULL || strcmp(ofw_bus_get_name(dev),
-	    "interrupt-controller") != 0)
-		return (ENXIO);
 
 	if (!ofw_bus_is_compatible(dev, "ibm,ppc-xicp"))
 		return (ENXIO);
@@ -166,9 +163,6 @@ xicp_probe(device_t dev)
 static int
 xics_probe(device_t dev)
 {
-	if (ofw_bus_get_name(dev) == NULL || strcmp(ofw_bus_get_name(dev),
-	    "interrupt-controller") != 0)
-		return (ENXIO);
 
 	if (!ofw_bus_is_compatible(dev, "ibm,ppc-xics"))
 		return (ENXIO);