From owner-svn-src-all@freebsd.org  Sun Apr 16 17:53:46 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 34D93D41517;
 Sun, 16 Apr 2017 17:53:46 +0000 (UTC) (envelope-from ian@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 04E90150E;
 Sun, 16 Apr 2017 17:53:45 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3GHrjrH042570;
 Sun, 16 Apr 2017 17:53:45 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3GHrj6v042569;
 Sun, 16 Apr 2017 17:53:45 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201704161753.v3GHrj6v042569@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 16 Apr 2017 17:53:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317033 - head/sys/arm/freescale/imx
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Apr 2017 17:53:46 -0000

Author: ian
Date: Sun Apr 16 17:53:44 2017
New Revision: 317033
URL: https://svnweb.freebsd.org/changeset/base/317033

Log:
  Convert probing to use an ofw_compat_data array, and add imx6ul to the list.

Modified:
  head/sys/arm/freescale/imx/imx6_usbphy.c

Modified: head/sys/arm/freescale/imx/imx6_usbphy.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_usbphy.c	Sun Apr 16 16:48:25 2017	(r317032)
+++ head/sys/arm/freescale/imx/imx6_usbphy.c	Sun Apr 16 17:53:44 2017	(r317033)
@@ -68,6 +68,12 @@ struct usbphy_softc {
 	u_int		phy_num;
 };
 
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6q-usbphy",	true},
+	{"fsl,imx6ul-usbphy",	true},
+	{NULL,			false}
+};
+
 static int
 usbphy_detach(device_t dev)
 {
@@ -167,7 +173,7 @@ usbphy_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (ofw_bus_is_compatible(dev, "fsl,imx6q-usbphy") == 0)
+	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
 		return (ENXIO);
 
 	device_set_desc(dev, "Freescale i.MX6 USB PHY");