[src/trunk]: src/sys/arch/arm/omap do some more setup, while there fix a bunc...

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

details:   https://anonhg.NetBSD.org/src/rev/ae614fa666d0
branches:  trunk
changeset: 783804:ae614fa666d0
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jan 09 04:38:14 2013 +0000

description:
do some more setup, while there fix a bunch of typos

diffstat:

 sys/arch/arm/omap/omap3_sdma.c    |   8 ++++++--
 sys/arch/arm/omap/omap3_sdmareg.h |  28 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r 164ddeb66a87 -r ae614fa666d0 sys/arch/arm/omap/omap3_sdma.c
--- a/sys/arch/arm/omap/omap3_sdma.c    Wed Jan 09 03:35:11 2013 +0000
+++ b/sys/arch/arm/omap/omap3_sdma.c    Wed Jan 09 04:38:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap3_sdma.c,v 1.1 2013/01/09 03:35:11 macallan Exp $  */
+/*     $NetBSD: omap3_sdma.c,v 1.2 2013/01/09 04:38:14 macallan Exp $  */
 
 /*
  * Copyright (c) 2012 Michael Lorenz
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdma.c,v 1.1 2013/01/09 03:35:11 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdma.c,v 1.2 2013/01/09 04:38:14 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,6 +109,10 @@
            OMAPDMA_IDLEMODE_SMART_STANDBY | OMAPDMA_SMART_IDLE | 
            OMAPDMA_AUTOIDLE);
 
+       /* allow more FIFO space for large bursts used by omapfb */
+       bus_space_write_4(sc->sc_iot, sc->sc_regh, OMAPDMA_GCR, 
+               (1 << OMAPDMA_GCR_ARB_RATE_SHIFT) | 0x80);
+
        omapdma_sc = sc;
 
        /*
diff -r 164ddeb66a87 -r ae614fa666d0 sys/arch/arm/omap/omap3_sdmareg.h
--- a/sys/arch/arm/omap/omap3_sdmareg.h Wed Jan 09 03:35:11 2013 +0000
+++ b/sys/arch/arm/omap/omap3_sdmareg.h Wed Jan 09 04:38:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap3_sdmareg.h,v 1.1 2013/01/09 03:35:11 macallan Exp $ */
+/*     $NetBSD: omap3_sdmareg.h,v 1.2 2013/01/09 04:38:14 macallan Exp $ */
 
 /*
  * Copyright (c) 2012 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdmareg.h,v 1.1 2013/01/09 03:35:11 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdmareg.h,v 1.2 2013/01/09 04:38:14 macallan Exp $");
 
 #ifndef OMAPDMA_REG_H
 #define OMAPDMA_REG_H
@@ -74,6 +74,18 @@
 #define OMAPDMA_CAPS_3         0x00000070
 #define OMAPDMA_CAPS_4         0x00000074
 #define OMAPDMA_GCR            0x00000078
+       #define OMAPDMA_GCR_ARB_RATE_MASK       0x00ff0000
+       #define OMAPDMA_GCR_ARB_RATE_SHIFT      16
+       #define OMAPDMA_GCR_FIFO_BUDGET_NONE    0x00000000
+       #define OMAPDMA_GCR_FIFO_BUDGET_75L     0x00004000
+       #define OMAPDMA_GCR_FIFO_BUDGET_25L     0x00008000
+       #define OMAPDMA_GCR_FIFO_BUDGET_50L     0x0000c000
+       #define OMAPDMA_GCR_HI_THREAD_NONE      0x00000000
+       #define OMAPDMA_GCR_HI_THREAD_0         0x00001000
+       #define OMAPDMA_GCR_HI_THREAD_01        0x00002000
+       #define OMAPDMA_GCR_HI_THREAD_012       0x00003000
+       #define OMAPDMA_GCR_MAX_FIFO_DEPTH_MASK 0x000000ff
+
 
 /*
  * there are 32 channels, each occupies a 0x60 register space starting at
@@ -149,12 +161,12 @@
        #define CSDPI_DST_BURST_32              0x00008000
        #define CSDPI_DST_BURST_64              0x0000c000
        #define CSDPI_DST_PACKED                0x00002000
-       #define CSDPI_SCR_BURST_MASK            0x00000180
-       #define CSDPI_SCR_BURST_SINGLE          0x00000000
-       #define CSDPI_SCR_BURST_16              0x00000080
-       #define CSDPI_SCR_BURST_32              0x00000100
-       #define CSDPI_SCR_BURST_64              0x00000180
-       #define CSDPI_SCR_PACKED                0x00000040
+       #define CSDPI_SRC_BURST_MASK            0x00000180
+       #define CSDPI_SRC_BURST_SINGLE          0x00000000
+       #define CSDPI_SRC_BURST_16              0x00000080
+       #define CSDPI_SRC_BURST_32              0x00000100
+       #define CSDPI_SRC_BURST_64              0x00000180
+       #define CSDPI_SRC_PACKED                0x00000040
        #define CSDPI_DATA_TYPE_MASK            0x00000003
        #define CSDPI_DATA_TYPE_8               0x00000000
        #define CSDPI_DATA_TYPE_16              0x00000001