Module Name: src
Committed By: kiyohara
Date: Tue Oct 4 15:51:34 UTC 2016
Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c
Log Message:
Support ADMA2 on OMAP4430.
Tested on Gumstix DuoVero.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/omap/omap3_sdhc.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/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.24 src/sys/arch/arm/omap/omap3_sdhc.c:1.25
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.24 Mon Aug 15 13:02:07 2016
+++ src/sys/arch/arm/omap/omap3_sdhc.c Tue Oct 4 15:51:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_sdhc.c,v 1.24 2016/08/15 13:02:07 mlelstv Exp $ */
+/* $NetBSD: omap3_sdhc.c,v 1.25 2016/10/04 15:51:34 kiyohara Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.24 2016/08/15 13:02:07 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.25 2016/10/04 15:51:34 kiyohara Exp $");
#include "opt_omap.h"
#include "edma.h"
@@ -259,8 +259,8 @@ obiosdhc_attach(device_t parent, device_
*/
sc->sc.sc_flags |= SDHC_FLAG_NO_HS_BIT;
-// sc->sc.sc_flags |= SDHC_FLAG_USE_DMA;
-// sc->sc.sc_flags |= SDHC_FLAG_USE_ADMA2;
+ sc->sc.sc_flags |= SDHC_FLAG_USE_DMA;
+ sc->sc.sc_flags |= SDHC_FLAG_USE_ADMA2;
#endif
sc->sc.sc_host = sc->sc_hosts;
sc->sc.sc_clkbase = 96000; /* 96MHZ */
@@ -480,6 +480,11 @@ no_dma:
SDHC_WRITE(sc, SDHC_CLOCK_CTL,
SDHC_READ(sc, SDHC_CLOCK_CTL) | SDHC_SDCLK_ENABLE);
+ if (sc->sc.sc_flags & SDHC_FLAG_USE_ADMA2)
+ bus_space_write_4(sc->sc_bst, sc->sc_bsh, MMCHS_CON,
+ bus_space_read_4(sc->sc_bst, sc->sc_bsh, MMCHS_CON) |
+ CON_MNS);
+
return;
fail:
