[src/trunk]: src/sys/arch/arm/allwinner ensure software reset signal is de-as...

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

details:   https://anonhg.NetBSD.org/src/rev/ade7ee8de393
branches:  trunk
changeset: 333146:ade7ee8de393
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Oct 20 19:04:22 2014 +0000

description:
ensure software reset signal is de-asserted on A31

diffstat:

 sys/arch/arm/allwinner/awin_mmc.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 17826c67ee30 -r ade7ee8de393 sys/arch/arm/allwinner/awin_mmc.c
--- a/sys/arch/arm/allwinner/awin_mmc.c Mon Oct 20 19:03:30 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_mmc.c Mon Oct 20 19:04:22 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.14 2014/10/11 17:29:59 jmcneill Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.15 2014/10/20 19:04:22 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.14 2014/10/11 17:29:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.15 2014/10/20 19:04:22 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -187,6 +187,12 @@
            AWIN_SD0_CLK_REG + (sc->sc_mmc_number * 4),
            AWIN_PLL_CFG_ENABLE | AWIN_PLL_CFG_PLL6 | div);
 
+       if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+               awin_reg_set_clear(aio->aio_core_bst, aio->aio_ccm_bsh,
+                   AWIN_A31_AHB_RESET0_REG,
+                   AWIN_A31_AHB_RESET0_SD0_RST << sc->sc_mmc_number, 0);
+       }
+
 #ifdef AWIN_MMC_DEBUG
        aprint_normal_dev(sc->sc_dev, "PLL6 @ %u Hz\n", freq);
 #endif