From owner-svn-src-all@freebsd.org  Sat Nov 19 15:35:11 2016
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 AB5D9C4A577;
 Sat, 19 Nov 2016 15:35:11 +0000 (UTC)
 (envelope-from cognet@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 7CD451EB5;
 Sat, 19 Nov 2016 15:35:11 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAJFZA54026453;
 Sat, 19 Nov 2016 15:35:10 GMT (envelope-from cognet@FreeBSD.org)
Received: (from cognet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAJFZAdC026452;
 Sat, 19 Nov 2016 15:35:10 GMT (envelope-from cognet@FreeBSD.org)
Message-Id: <201611191535.uAJFZAdC026452@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cognet set sender to
 cognet@FreeBSD.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 19 Nov 2016 15:35:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308836 - head/sys/arm/ti
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: Sat, 19 Nov 2016 15:35:11 -0000

Author: cognet
Date: Sat Nov 19 15:35:10 2016
New Revision: 308836
URL: https://svnweb.freebsd.org/changeset/base/308836

Log:
  Don't attempt to get the chip revision if it's not a supported TI chip

Modified:
  head/sys/arm/ti/ti_cpuid.c

Modified: head/sys/arm/ti/ti_cpuid.c
==============================================================================
--- head/sys/arm/ti/ti_cpuid.c	Sat Nov 19 15:10:10 2016	(r308835)
+++ head/sys/arm/ti/ti_cpuid.c	Sat Nov 19 15:35:10 2016	(r308836)
@@ -43,6 +43,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <machine/intr.h>
 
+#include <dev/fdt/simplebus.h>
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
 #include <arm/ti/tivar.h>
 #include <arm/ti/ti_cpuid.h>
 
@@ -268,6 +272,12 @@ am335x_get_revision(void)
 static void
 ti_cpu_ident(void *dummy)
 {
+	phandle_t root;
+
+	root = OF_finddevice("/");
+	if (!ofw_bus_node_is_compatible(root, "ti,omap4") &&
+	    !ofw_bus_node_is_compatible(root, "ti,am33xx"))
+		return;
 	switch(ti_chip()) {
 	case CHIP_OMAP_4:
 		omap4_get_revision();