diff options
| author | jhibbits <jhibbits@FreeBSD.org> | 2015-08-27 03:47:56 +0000 |
|---|---|---|
| committer | jhibbits <jhibbits@FreeBSD.org> | 2015-08-27 03:47:56 +0000 |
| commit | 3a15a2ed889c2c2d56c4fd62ebbda75d99277a5b (patch) | |
| tree | df1b0a9ba4fbd96eb4b5a5a96acc1089b3806307 /sys | |
| parent | aa68072ffca481e6741370154f268088181ac583 (diff) | |
| download | FreeBSD-src-3a15a2ed889c2c2d56c4fd62ebbda75d99277a5b.zip FreeBSD-src-3a15a2ed889c2c2d56c4fd62ebbda75d99277a5b.tar.gz | |
Fix freescale sdhc driver, and add it to the files list.
Also, add it to the mmc DRIVER_MODULE attachment list.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files.powerpc | 1 | ||||
| -rw-r--r-- | sys/dev/mmc/mmc.c | 1 | ||||
| -rw-r--r-- | sys/powerpc/mpc85xx/fsl_sdhc.c | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index bf70f2e..d647acc 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -133,6 +133,7 @@ powerpc/mikrotik/platform_rb.c optional mikrotik 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 diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c index e8871c7..bbd72bb 100644 --- a/sys/dev/mmc/mmc.c +++ b/sys/dev/mmc/mmc.c @@ -1818,6 +1818,7 @@ DRIVER_MODULE(mmc, aml8726_sdxc, mmc_driver, mmc_devclass, NULL, NULL); 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); diff --git a/sys/powerpc/mpc85xx/fsl_sdhc.c b/sys/powerpc/mpc85xx/fsl_sdhc.c index 12b18b1..4f9ef87 100644 --- a/sys/powerpc/mpc85xx/fsl_sdhc.c +++ b/sys/powerpc/mpc85xx/fsl_sdhc.c @@ -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 |
