svn commit: r287189 - in head/sys: conf dev/mmc powerpc/mpc85xx

[Justin Hibbits]

Author: jhibbits
Date: Thu Aug 27 03:47:56 2015
New Revision: 287189
URL: https://svnweb.freebsd.org/changeset/base/287189

Log:
  Fix freescale sdhc driver, and add it to the files list.
  
  Also, add it to the mmc DRIVER_MODULE attachment list.

Modified:
  head/sys/conf/files.powerpc
  head/sys/dev/mmc/mmc.c
  head/sys/powerpc/mpc85xx/fsl_sdhc.c

Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc	Thu Aug 27 03:44:06 2015	(r287188)
+++ head/sys/conf/files.powerpc	Thu Aug 27 03:47:56 2015	(r287189)
@@ -133,6 +133,7 @@ powerpc/mikrotik/platform_rb.c	optional	
 powerpc/mpc85xx/atpic.c		optional	mpc85xx isa
 powerpc/mpc85xx/ds1553_bus_fdt.c	optional	ds1553 fdt
 powerpc/mpc85xx/ds1553_core.c	optional	ds1553
+powerpc/mpc85xx/fsl_sdhc.c	optional	mpc85xx sdhc
 powerpc/mpc85xx/i2c.c		optional	iicbus fdt
 powerpc/mpc85xx/isa.c		optional	mpc85xx isa
 powerpc/mpc85xx/lbc.c		optional	mpc85xx

Modified: head/sys/dev/mmc/mmc.c
==============================================================================
--- head/sys/dev/mmc/mmc.c	Thu Aug 27 03:44:06 2015	(r287188)
+++ head/sys/dev/mmc/mmc.c	Thu Aug 27 03:47:56 2015	(r287189)
@@ -1818,6 +1818,7 @@ DRIVER_MODULE(mmc, aml8726_sdxc, mmc_dri
 DRIVER_MODULE(mmc, at91_mci, mmc_driver, mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, sdhci_bcm, mmc_driver, mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, sdhci_fdt, mmc_driver, mmc_devclass, NULL, NULL);
+DRIVER_MODULE(mmc, sdhci_fsl, mmc_driver, mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, sdhci_imx, mmc_driver, mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, sdhci_pci, mmc_driver, mmc_devclass, NULL, NULL);
 DRIVER_MODULE(mmc, sdhci_ti, mmc_driver, mmc_devclass, NULL, NULL);

Modified: head/sys/powerpc/mpc85xx/fsl_sdhc.c
==============================================================================
--- head/sys/powerpc/mpc85xx/fsl_sdhc.c	Thu Aug 27 03:44:06 2015	(r287188)
+++ head/sys/powerpc/mpc85xx/fsl_sdhc.c	Thu Aug 27 03:47:56 2015	(r287189)
@@ -117,14 +117,14 @@ static device_method_t fsl_sdhc_methods[
 
 /* kobj_class definition */
 static driver_t fsl_sdhc_driver = {
-	"sdhci",
+	"sdhci_fsl",
 	fsl_sdhc_methods,
 	sizeof(struct fsl_sdhc_softc)
 };
 
 static devclass_t fsl_sdhc_devclass;
 
-DRIVER_MODULE(sdhci, simplebus, fsl_sdhc_driver, fsl_sdhc_devclass, 0, 0);
+DRIVER_MODULE(sdhci_fsl, simplebus, fsl_sdhc_driver, fsl_sdhc_devclass, 0, 0);
 
 
 /*****************************************************************************
@@ -481,7 +481,7 @@ static void
 finalize_request(struct fsl_sdhc_softc *sc)
 {
 
-	DPRINTF("finishing request %x\n", sc->request);
+	DPRINTF("finishing request %p\n", sc->request);
 
 	sc->request->done(sc->request);
 	sc->request = NULL;
@@ -982,7 +982,6 @@ dump_registers(struct fsl_sdhc_softc *sc
 {
 	printf("PRSSTAT = 0x%08x\n", read4(sc, SDHC_PRSSTAT));
 	printf("PROCTL = 0x%08x\n", read4(sc, SDHC_PROCTL));
-	printf("PMUXCR = 0x%08x\n", ccsr_read4(OCP85XX_PMUXCR));
 	printf("HOSTCAPBLT = 0x%08x\n", read4(sc, SDHC_HOSTCAPBLT));
 	printf("IRQSTAT = 0x%08x\n", read4(sc, SDHC_IRQSTAT));
 	printf("IRQSTATEN = 0x%08x\n", read4(sc, SDHC_IRQSTATEN));
@@ -990,7 +989,6 @@ dump_registers(struct fsl_sdhc_softc *sc
 	printf("WML = 0x%08x\n", read4(sc, SDHC_WML));
 	printf("DSADDR = 0x%08x\n", read4(sc, SDHC_DSADDR));
 	printf("XFERTYP = 0x%08x\n", read4(sc, SDHC_XFERTYP));
-	printf("ECMCR = 0x%08x\n", ccsr_read4(OCP85XX_ECMCR));
 	printf("DCR = 0x%08x\n", read4(sc, SDHC_DCR));
 }
 #endif