[src/trunk]: src/sys/dev/ic when resetting controller, dont preserve DWC_MMC_...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1bcaa765ccc
branches:  trunk
changeset: 335736:f1bcaa765ccc
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Jan 22 17:06:15 2015 +0000

description:
when resetting controller, dont preserve DWC_MMC_CTRL_REG state. makes this work on my radxa lite

diffstat:

 sys/dev/ic/dwc_mmc.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 1592f2fbbaf7 -r f1bcaa765ccc sys/dev/ic/dwc_mmc.c
--- a/sys/dev/ic/dwc_mmc.c      Thu Jan 22 16:19:53 2015 +0000
+++ b/sys/dev/ic/dwc_mmc.c      Thu Jan 22 17:06:15 2015 +0000
@@ -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@localhost>
@@ -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 @@
                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)