From owner-svn-src-head@freebsd.org  Sat Apr 15 17:02:33 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 AE5C4D3E4BD;
 Sat, 15 Apr 2017 17:02:33 +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 80703BBE;
 Sat, 15 Apr 2017 17:02:33 +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 v3FH2WvX029053;
 Sat, 15 Apr 2017 17:02:32 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3FH2W3j029052;
 Sat, 15 Apr 2017 17:02:32 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201704151702.v3FH2W3j029052@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: Sat, 15 Apr 2017 17:02:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316972 - 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-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: Sat, 15 Apr 2017 17:02:33 -0000

Author: ian
Date: Sat Apr 15 17:02:32 2017
New Revision: 316972
URL: https://svnweb.freebsd.org/changeset/base/316972

Log:
  Add support for the imx6ul SoC.

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

Modified: head/sys/arm/freescale/imx/imx_gpt.c
==============================================================================
--- head/sys/arm/freescale/imx/imx_gpt.c	Sat Apr 15 17:00:50 2017	(r316971)
+++ head/sys/arm/freescale/imx/imx_gpt.c	Sat Apr 15 17:02:32 2017	(r316972)
@@ -118,6 +118,7 @@ static struct resource_spec imx_gpt_spec
 static struct ofw_compat_data compat_data[] = {
 	{"fsl,imx6dl-gpt", 1},
 	{"fsl,imx6q-gpt",  1},
+	{"fsl,imx6ul-gpt", 1},
 	{"fsl,imx53-gpt",  1},
 	{"fsl,imx51-gpt",  1},
 	{"fsl,imx31-gpt",  1},
@@ -133,6 +134,15 @@ imx_gpt_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
+	/*
+	 *  We only support a single unit, because the only thing this driver
+	 *  does with the complex timer hardware is supply the system
+	 *  timecounter and eventtimer.  There is nothing useful we can do with
+	 *  the additional device instances that exist in some chips.
+	 */
+	if (device_get_unit(dev) > 0)
+		return (ENXIO);
+
 	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
 		device_set_desc(dev, "Freescale i.MX GPT timer");
 		return (BUS_PROBE_DEFAULT);