From owner-svn-src-head@freebsd.org  Fri Mar 24 01:30:19 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB48ECA1D8C;
 Fri, 24 Mar 2017 01:30:19 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9A8FBA53;
 Fri, 24 Mar 2017 01:30:19 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2O1UIVl018846;
 Fri, 24 Mar 2017 01:30:18 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2O1UIA5018845;
 Fri, 24 Mar 2017 01:30:18 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201703240130.v2O1UIA5018845@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Fri, 24 Mar 2017 01:30:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315879 - head/sys/powerpc/mpc85xx
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Mar 2017 01:30:20 -0000

Author: jhibbits
Date: Fri Mar 24 01:30:18 2017
New Revision: 315879
URL: https://svnweb.freebsd.org/changeset/base/315879

Log:
  Switch qoriq_gpio over to using ofw_bus_search_compatible
  
  This will make it easier to add more compatibility strings in the future, if
  necessary.

Modified:
  head/sys/powerpc/mpc85xx/qoriq_gpio.c

Modified: head/sys/powerpc/mpc85xx/qoriq_gpio.c
==============================================================================
--- head/sys/powerpc/mpc85xx/qoriq_gpio.c	Fri Mar 24 01:23:07 2017	(r315878)
+++ head/sys/powerpc/mpc85xx/qoriq_gpio.c	Fri Mar 24 01:30:18 2017	(r315879)
@@ -215,13 +215,18 @@ qoriq_gpio_pin_toggle(device_t dev, uint
 	return (0);
 }
 
+static struct ofw_compat_data gpio_matches[] = {
+    {"fsl,qoriq-gpio", 1},
+    {"fsl,pq3-gpio", 1},
+    {"fsl,mpc8572-gpio", 1},
+    {0, 0}
+};
+
 static int
 qoriq_gpio_probe(device_t dev)
 {
 
-	if (!ofw_bus_is_compatible(dev, "fsl,qoriq-gpio") &&
-	    !ofw_bus_is_compatible(dev, "fsl,pq3-gpio") &&
-	    !ofw_bus_is_compatible(dev, "fsl,mpc8572-gpio"))
+	if (ofw_bus_search_compatible(dev, gpio_matches)->ocd_data == 0)
 		return (ENXIO);
 
 	device_set_desc(dev, "Freescale QorIQ GPIO driver");