Module Name: src
Committed By: jmcneill
Date: Mon Oct 20 19:04:23 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_mmc.c
Log Message:
ensure software reset signal is de-asserted on A31
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/allwinner/awin_mmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_mmc.c
diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.14 src/sys/arch/arm/allwinner/awin_mmc.c:1.15
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.14 Sat Oct 11 17:29:59 2014
+++ src/sys/arch/arm/allwinner/awin_mmc.c Mon Oct 20 19:04:22 2014
@@ -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 <jmcne...@invisible.ca>
@@ -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_mmc_probe_clocks(struct awin_mmc_so
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
