Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/allwinner DMA not required on A31 until it work...



details:   https://anonhg.NetBSD.org/src/rev/d28635ba8d22
branches:  trunk
changeset: 332954:d28635ba8d22
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 12 17:20:46 2014 +0000

description:
DMA not required on A31 until it works, add A31 RTC locator

diffstat:

 sys/arch/arm/allwinner/awin_io.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r fbf105d5992b -r d28635ba8d22 sys/arch/arm/allwinner/awin_io.c
--- a/sys/arch/arm/allwinner/awin_io.c  Sun Oct 12 17:19:43 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_io.c  Sun Oct 12 17:20:46 2014 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.18 2014/10/12 14:06:18 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.19 2014/10/12 17:20:46 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -95,7 +95,7 @@
        { "awinicu", OFFANDSIZE(INTC), NOPORT, NOINTR, A10|REQ },
        { "awingpio", OFFANDSIZE(PIO), NOPORT, NOINTR, AANY|REQ },
        { "awindma", OFFANDSIZE(DMA), NOPORT, AWIN_IRQ_DMA, A10|A20|REQ },
-       { "awindma", OFFANDSIZE(DMA), NOPORT, AWIN_A31_IRQ_DMA, A31|REQ },
+       { "awindma", OFFANDSIZE(DMA), NOPORT, AWIN_A31_IRQ_DMA, A31 },
        { "awintmr", OFFANDSIZE(TMR), NOPORT, AWIN_IRQ_TMR0, A10 },
        { "com", OFFANDSIZE(UART0), 0, AWIN_IRQ_UART0, A10|A20 },
        { "com", OFFANDSIZE(UART1), 1, AWIN_IRQ_UART1, A10|A20 },
@@ -107,7 +107,8 @@
        { "com", OFFANDSIZE(UART7), 7, AWIN_IRQ_UART7, A10|A20 },
        { "com", OFFANDSIZE(UART0), 0, AWIN_A31_IRQ_UART0, A31 },
        { "awinwdt", OFFANDSIZE(TMR), NOPORT, NOINTR, AANY },
-       { "awinrtc", OFFANDSIZE(TMR), NOPORT, NOINTR, AANY },
+       { "awinrtc", OFFANDSIZE(TMR), NOPORT, NOINTR, A10|A20 },
+       { "awinrtc", OFFANDSIZE(A31_RTC), NOPORT, NOINTR, A31 },
        { "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_IRQ_HDMI0, A20 },
        { "awinusb", OFFANDSIZE(USB1), 0, NOINTR, A10|A20 },
        { "awinusb", OFFANDSIZE(USB2), 1, NOINTR, A10|A20 },



Home | Main Index | Thread Index | Old Index