svn commit: r352502 - stable/12/sys/arm/arm

[Jayachandran C.]

Author: jchandra
Date: Wed Sep 18 23:30:27 2019
New Revision: 352502
URL: https://svnweb.freebsd.org/changeset/base/352502

Log:
  MFC r339517:
  
  arm generic_timer: fix armv8 timer desc
  
  In the FDT based probe, check for "arm,armv8-timer" before "arm,armv7-timer".
  This gets the description right when the timer node has both entries in
  compatible list.

Modified:
  stable/12/sys/arm/arm/generic_timer.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm/arm/generic_timer.c
==============================================================================
--- stable/12/sys/arm/arm/generic_timer.c	Wed Sep 18 23:23:34 2019	(r352501)
+++ stable/12/sys/arm/arm/generic_timer.c	Wed Sep 18 23:30:27 2019	(r352502)
@@ -322,11 +322,11 @@ arm_tmr_fdt_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (ofw_bus_is_compatible(dev, "arm,armv7-timer")) {
-		device_set_desc(dev, "ARMv7 Generic Timer");
-		return (BUS_PROBE_DEFAULT);
-	} else if (ofw_bus_is_compatible(dev, "arm,armv8-timer")) {
+	if (ofw_bus_is_compatible(dev, "arm,armv8-timer")) {
 		device_set_desc(dev, "ARMv8 Generic Timer");
+		return (BUS_PROBE_DEFAULT);
+	} else if (ofw_bus_is_compatible(dev, "arm,armv7-timer")) {
+		device_set_desc(dev, "ARMv7 Generic Timer");
 		return (BUS_PROBE_DEFAULT);
 	}