svn commit: r264052 - head/sys/arm/freescale/imx

[Ian Lepore]

Author: ian
Date: Wed Apr  2 19:06:53 2014
New Revision: 264052
URL: http://svnweb.freebsd.org/changeset/base/264052

Log:
  Don't call sdhci_init_slot() until after handling the FDT properties
  related to detecting card presence.  This actually makes no difference
  now, but will when we get support for gpio-based card detection.

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

Modified: head/sys/arm/freescale/imx/imx_sdhci.c
==============================================================================
--- head/sys/arm/freescale/imx/imx_sdhci.c	Wed Apr  2 18:49:50 2014	(r264051)
+++ head/sys/arm/freescale/imx/imx_sdhci.c	Wed Apr  2 19:06:53 2014	(r264052)
@@ -730,9 +730,6 @@ imx_sdhci_attach(device_t dev)
 		sc->baseclk_hz = imx51_get_clock(IMX51CLK_PERCLK_ROOT);
 	}
 
-	sdhci_init_slot(dev, &sc->slot, 0);
-	callout_init(&sc->r1bfix_callout, true);
-
 	/*
 	 * If the slot is flagged with the non-removable property, set our flag
 	 * to always force the SDHCI_CARD_PRESENT bit on.
@@ -752,6 +749,9 @@ imx_sdhci_attach(device_t dev)
 		sc->force_card_present = true;
 	}
 
+	callout_init(&sc->r1bfix_callout, true);
+	sdhci_init_slot(dev, &sc->slot, 0);
+
 	bus_generic_probe(dev);
 	bus_generic_attach(dev);