diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2015-01-22 17:06:15 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2015-01-22 17:06:15 +0000 |
| commit | a3e032f03eb212c8a0e25263013ece9a61943a2e (patch) | |
| tree | 969439c91cdfdc4616f573b7c23c7879da4a92a2 /sys/dev/ic | |
| parent | 2ccd5361a94839af40fe6183ebd44d1013fe0456 (diff) | |
when resetting controller, dont preserve DWC_MMC_CTRL_REG state. makes this work on my radxa lite
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/dwc_mmc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ic/dwc_mmc.c b/sys/dev/ic/dwc_mmc.c index 5b9a353f39c..0bf93014b6f 100644 --- a/sys/dev/ic/dwc_mmc.c +++ b/sys/dev/ic/dwc_mmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_mmc.c,v 1.5 2015/01/17 19:10:18 jmcneill Exp $ */ +/* $NetBSD: dwc_mmc.c,v 1.6 2015/01/22 17:06:15 jmcneill Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill <jmcneill@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_dwc_mmc.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.5 2015/01/17 19:10:18 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.6 2015/01/22 17:06:15 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -290,8 +290,7 @@ dwc_mmc_host_reset(sdmmc_chipset_handle_t sch) MMC_WRITE(sc, DWC_MMC_PWREN_REG, DWC_MMC_PWREN_POWER_ENABLE); } - MMC_WRITE(sc, DWC_MMC_CTRL_REG, - MMC_READ(sc, DWC_MMC_CTRL_REG) | DWC_MMC_CTRL_RESET_ALL); + MMC_WRITE(sc, DWC_MMC_CTRL_REG, DWC_MMC_CTRL_RESET_ALL); while (--retry > 0) { ctrl = MMC_READ(sc, DWC_MMC_CTRL_REG); if ((ctrl & DWC_MMC_CTRL_RESET_ALL) == 0) |
