Module Name: src
Committed By: nonaka
Date: Thu Feb 5 13:27:18 UTC 2015
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_dmac.c
Log Message:
Don't write DMAC_DINT register on PXA270, because read-only register.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/pxa2x0_dmac.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/xscale/pxa2x0_dmac.c
diff -u src/sys/arch/arm/xscale/pxa2x0_dmac.c:1.12 src/sys/arch/arm/xscale/pxa2x0_dmac.c:1.13
--- src/sys/arch/arm/xscale/pxa2x0_dmac.c:1.12 Mon Nov 12 18:00:38 2012
+++ src/sys/arch/arm/xscale/pxa2x0_dmac.c Thu Feb 5 13:27:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_dmac.c,v 1.12 2012/11/12 18:00:38 skrll Exp $ */
+/* $NetBSD: pxa2x0_dmac.c,v 1.13 2015/02/05 13:27:18 nonaka Exp $ */
/*
* Copyright (c) 2003, 2005 Wasabi Systems, Inc.
@@ -321,8 +321,9 @@ pxadmac_attach(device_t parent, device_t
dmac_reg_write(sc, DMAC_DRCMR(i), 0);
sc->sc_active[i] = NULL;
}
- dmac_reg_write(sc, DMAC_DINT,
- dmac_reg_read(sc, DMAC_DINT) & DMAC_DINT_MASK);
+ if (!CPU_IS_PXA270)
+ dmac_reg_write(sc, DMAC_DINT,
+ dmac_reg_read(sc, DMAC_DINT) & DMAC_DINT_MASK);
/*
* Initialise the request queues
@@ -1212,7 +1213,8 @@ dmac_channel_intr(struct pxadmac_softc *
/*
* Clear down the interrupt in the DMA Interrupt Register
*/
- dmac_reg_write(sc, DMAC_DINT, (1u << channel));
+ if (!CPU_IS_PXA270)
+ dmac_reg_write(sc, DMAC_DINT, (1u << channel));
/*
* If this is a looping request, invoke the 'done' callback and
