svn commit: r259359 - stable/10/sys/arm/freescale/imx

[Ian Lepore]

Author: ian
Date: Fri Dec 13 22:50:12 2013
New Revision: 259359
URL: http://svnweb.freebsd.org/changeset/base/259359

Log:
  MFC r257561:
  
    Bugfix:  the attach routine needs to use the same table of fdt compat
    strings that the probe routine used.

Modified:
  stable/10/sys/arm/freescale/imx/imx_sdhci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/freescale/imx/imx_sdhci.c
==============================================================================
--- stable/10/sys/arm/freescale/imx/imx_sdhci.c	Fri Dec 13 22:49:18 2013	(r259358)
+++ stable/10/sys/arm/freescale/imx/imx_sdhci.c	Fri Dec 13 22:50:12 2013	(r259359)
@@ -558,13 +558,9 @@ imx_sdhci_attach(device_t dev)
 
 	sc->dev = dev;
 
-	if (ofw_bus_is_compatible(dev, "fsl,imx51-esdhc")) {
-		sc->hwtype = HWTYPE_ESDHC;
-	} else if (ofw_bus_is_compatible(dev, "fsl,imx-usdhc")) {
-		sc->hwtype = HWTYPE_USDHC;
-	} else {
+	sc->hwtype = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+	if (sc->hwtype == HWTYPE_NONE)
 		panic("Impossible: not compatible in imx_sdhci_attach()");
-	}
 
 	rid = 0;
 	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,