Module Name: src
Committed By: kiyohara
Date: Wed Jul 18 09:51:24 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: kirkwoodreg.h
Log Message:
Add attributes, irqs and base-address for PEX1.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/kirkwoodreg.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/marvell/kirkwoodreg.h
diff -u src/sys/arch/arm/marvell/kirkwoodreg.h:1.1 src/sys/arch/arm/marvell/kirkwoodreg.h:1.2
--- src/sys/arch/arm/marvell/kirkwoodreg.h:1.1 Sun Oct 3 05:49:24 2010
+++ src/sys/arch/arm/marvell/kirkwoodreg.h Wed Jul 18 09:51:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kirkwoodreg.h,v 1.1 2010/10/03 05:49:24 kiyohara Exp $ */
+/* $NetBSD: kirkwoodreg.h,v 1.2 2012/07/18 09:51:23 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -60,6 +60,8 @@
#define KIRKWOOD_ATTR_BOOTROM 0x1d
#define KIRKWOOD_ATTR_PEX_MEM 0xe8
#define KIRKWOOD_ATTR_PEX_IO 0xe0
+#define KIRKWOOD_ATTR_PEX1_MEM 0xd8
+#define KIRKWOOD_ATTR_PEX1_IO 0xd0
#define KIRKWOOD_ATTR_CRYPT 0x00
#define KIRKWOOD_IRQ_HIGH 0 /* High interrupt */
@@ -71,6 +73,7 @@
#define KIRKWOOD_IRQ_XOR1CHAN0 7 /* Xor 1 Channel0 */
#define KIRKWOOD_IRQ_XOR1CHAN1 8 /* Xor 1 Channel1 */
#define KIRKWOOD_IRQ_PEX0INT 9 /* PCI Express port0 INT A-D */
+#define KIRKWOOD_IRQ_PEX1INT 10 /* PCI Express port1 INT A-D */
#define KIRKWOOD_IRQ_GBE0SUM 11 /* GbE0 summary */
#define KIRKWOOD_IRQ_GBE0RX 12 /* GbE0 receive interrupt */
#define KIRKWOOD_IRQ_GBE0TX 13 /* GbE0 transmit interrupt */
@@ -101,6 +104,7 @@
#define KIRKWOOD_IRQ_XOR0ERR 42 /* XOR0 error */
#define KIRKWOOD_IRQ_XOR1ERR 43 /* XOR1 error */
#define KIRKWOOD_IRQ_PEX0ERR 44 /* PCI Express0 error */
+#define KIRKWOOD_IRQ_PEX1ERR 45 /* PCI Express1 error */
#define KIRKWOOD_IRQ_GBE0ERR 46 /* GbE port0 error */
#define KIRKWOOD_IRQ_GBE1ERR 47 /* GbE port1 error */
#define KIRKWOOD_IRQ_USBERR 48 /* USB error */
@@ -158,6 +162,11 @@
/*
+ * PCI-Express Interface Registers
+ */
+#define KIRKWOOD_PEX1_BASE (MVSOC_PEX_BASE + 0x4000)
+
+/*
* Cryptographic Engine and Security Accelerator Registers
*/
#define KIRKWOOD_CESA_BASE (KIRKWOOD_UNITID2PHYS(CRYPT)) /* 0x30000 */
