Module Name: src
Committed By: jmcneill
Date: Thu Oct 16 00:03:48 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_intr.h awin_io.c
Log Message:
add A31 HDMI IRQ
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_intr.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/allwinner/awin_io.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_intr.h
diff -u src/sys/arch/arm/allwinner/awin_intr.h:1.7 src/sys/arch/arm/allwinner/awin_intr.h:1.8
--- src/sys/arch/arm/allwinner/awin_intr.h:1.7 Sun Oct 12 23:57:58 2014
+++ src/sys/arch/arm/allwinner/awin_intr.h Thu Oct 16 00:03:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_intr.h,v 1.7 2014/10/12 23:57:58 jmcneill Exp $ */
+/* $NetBSD: awin_intr.h,v 1.8 2014/10/16 00:03:48 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -160,5 +160,6 @@
#define AWIN_A31_IRQ_USB3 106
#define AWIN_A31_IRQ_USB4 108
#define AWIN_A31_IRQ_GMAC 114
+#define AWIN_A31_IRQ_HDMI 120
#endif /* _ARM_ALLWINNER_AWIN_INTR_H_ */
Index: src/sys/arch/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.20 src/sys/arch/arm/allwinner/awin_io.c:1.21
--- src/sys/arch/arm/allwinner/awin_io.c:1.20 Sun Oct 12 23:57:58 2014
+++ src/sys/arch/arm/allwinner/awin_io.c Thu Oct 16 00:03:48 2014
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.20 2014/10/12 23:57:58 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.21 2014/10/16 00:03:48 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -110,6 +110,7 @@ static const struct awin_locators awin_l
{ "awinrtc", OFFANDSIZE(TMR), NOPORT, NOINTR, A10|A20 },
{ "awinrtc", OFFANDSIZE(A31_RTC), NOPORT, NOINTR, A31 },
{ "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_IRQ_HDMI0, A20 },
+ { "awinhdmi", OFFANDSIZE(HDMI), NOPORT, AWIN_A31_IRQ_HDMI, A31 },
{ "awinusb", OFFANDSIZE(USB1), 0, NOINTR, A10|A20 },
{ "awinusb", OFFANDSIZE(USB2), 1, NOINTR, A10|A20 },
{ "awinusb", OFFANDSIZE(A31_USB1), 0, NOINTR, A31 },