Module Name: src Committed By: jmcneill Date: Wed Sep 3 21:42:46 UTC 2014
Modified Files: src/sys/arch/arm/allwinner: awin_intr.h awin_reg.h Log Message: AWIN_CORE_PBASE+22c00h and irq 62 are for audio codec; rename defines to match (AC) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/allwinner/awin_reg.h 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_intr.h diff -u src/sys/arch/arm/allwinner/awin_intr.h:1.3 src/sys/arch/arm/allwinner/awin_intr.h:1.4 --- src/sys/arch/arm/allwinner/awin_intr.h:1.3 Sat Sep 7 00:35:52 2013 +++ src/sys/arch/arm/allwinner/awin_intr.h Wed Sep 3 21:42:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_intr.h,v 1.3 2013/09/07 00:35:52 matt Exp $ */ +/* $NetBSD: awin_intr.h,v 1.4 2014/09/03 21:42:46 jmcneill Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. @@ -72,7 +72,7 @@ #define AWIN_IRQ_DMA 59 #define AWIN_IRQ_PIO 60 #define AWIN_IRQ_TP 61 -#define AWIN_IRQ_ADDC 62 +#define AWIN_IRQ_AC 62 #define AWIN_IRQ_LRADC 63 #define AWIN_IRQ_SDMMC0 64 #define AWIN_IRQ_SDMMC1 65 Index: src/sys/arch/arm/allwinner/awin_reg.h diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.15 src/sys/arch/arm/allwinner/awin_reg.h:1.16 --- src/sys/arch/arm/allwinner/awin_reg.h:1.15 Sun Aug 24 21:42:06 2014 +++ src/sys/arch/arm/allwinner/awin_reg.h Wed Sep 3 21:42:46 2014 @@ -96,7 +96,7 @@ #define AWIN_IIS0_OFFSET 0x00022000 #define AWIN_IIS1_OFFSET 0x00022400 #define AWIN_LRADC_OFFSET 0x00022800 -#define AWIN_ADDA_OFFSET 0x00022C00 +#define AWIN_AC_OFFSET 0x00022C00 #define AWIN_KEYPAD_OFFSET 0x00023000 #define AWIN_TZPC_OFFSET 0x00023400 /* A10 */ #define AWIN_SID_OFFSET 0x00023800