svn commit: r254589 - head/sys/dev/uart

[Ian Lepore]

Author: ian
Date: Wed Aug 21 04:05:06 2013
New Revision: 254589
URL: http://svnweb.freebsd.org/changeset/base/254589

Log:
  Check for generic ns16550 after all other types.  A device may be compatible
  with 16550 but also have a more specific/capable driver earlier in the list.

Modified:
  head/sys/dev/uart/uart_bus_fdt.c

Modified: head/sys/dev/uart/uart_bus_fdt.c
==============================================================================
--- head/sys/dev/uart/uart_bus_fdt.c	Wed Aug 21 02:14:23 2013	(r254588)
+++ head/sys/dev/uart/uart_bus_fdt.c	Wed Aug 21 04:05:06 2013	(r254589)
@@ -101,9 +101,7 @@ uart_fdt_probe(device_t dev)
 	int err;
 
 	sc = device_get_softc(dev);
-	if (ofw_bus_is_compatible(dev, "ns16550"))
-		sc->sc_class = &uart_ns8250_class;
-	else if (ofw_bus_is_compatible(dev, "lpc,uart"))
+	if (ofw_bus_is_compatible(dev, "lpc,uart"))
 		sc->sc_class = &uart_lpc_class;
 	else if (ofw_bus_is_compatible(dev, "fsl,imx-uart"))
 		sc->sc_class = &uart_imx_class;
@@ -113,6 +111,8 @@ uart_fdt_probe(device_t dev)
 		sc->sc_class = &uart_s3c2410_class;
 	else if (ofw_bus_is_compatible(dev, "cadence,uart"))
 		sc->sc_class = &uart_cdnc_class;
+	else if (ofw_bus_is_compatible(dev, "ns16550"))
+		sc->sc_class = &uart_ns8250_class;
 	else
 		return (ENXIO);