Module Name: src
Committed By: jmcneill
Date: Sun Oct 26 15:07:33 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_dma_a10.c
Log Message:
when enabling IRQ, compare channel type to the channel type, not the type
(string) passed in from the caller -- unbreaks A10/A20 audio after awindma split
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/allwinner/awin_dma_a10.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_dma_a10.c
diff -u src/sys/arch/arm/allwinner/awin_dma_a10.c:1.1 src/sys/arch/arm/allwinner/awin_dma_a10.c:1.2
--- src/sys/arch/arm/allwinner/awin_dma_a10.c:1.1 Mon Oct 13 12:34:00 2014
+++ src/sys/arch/arm/allwinner/awin_dma_a10.c Sun Oct 26 15:07:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_dma_a10.c,v 1.1 2014/10/13 12:34:00 jmcneill Exp $ */
+/* $NetBSD: awin_dma_a10.c,v 1.2 2014/10/26 15:07:33 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_dma_a10.c,v 1.1 2014/10/13 12:34:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_dma_a10.c,v 1.2 2014/10/26 15:07:33 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -195,7 +195,7 @@ awin_dma_a10_alloc(struct awin_dma_softc
ch->ch_callbackarg = cbarg;
irqen = DMA_READ(sc, AWIN_DMA_IRQ_EN_REG);
- if (type == CH_NDMA)
+ if (ch->ch_type == CH_NDMA)
irqen |= AWIN_DMA_IRQ_NDMA_END(index);
else
irqen |= AWIN_DMA_IRQ_DDMA_END(index);
