Module Name: src
Committed By: kiyohara
Date: Sat Jul 21 04:30:34 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: kirkwoodreg.h
Log Message:
Add some comments of 88F6282 and TWSI column.
Add IRQ and BASE for TWSI1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/sys/arch/arm/marvell/kirkwoodreg.h:1.3
--- src/sys/arch/arm/marvell/kirkwoodreg.h:1.2 Wed Jul 18 09:51:23 2012
+++ src/sys/arch/arm/marvell/kirkwoodreg.h Sat Jul 21 04:30:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kirkwoodreg.h,v 1.2 2012/07/18 09:51:23 kiyohara Exp $ */
+/* $NetBSD: kirkwoodreg.h,v 1.3 2012/07/21 04:30:34 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -32,11 +32,14 @@
#include <dev/marvell/mvgbereg.h>
/*
- * MHz TCLK GbE SATA TDMI Audio MTS GPIO
- * 6180: 600/800, 166, x1, -, -, o, -, 30
- * 6190: 600, 166, *x2, x1, -, -, -, 36 * GbEx1+100BTx1
- * 6192: 800, 166, x2, x2, o, o, o, 36
- * 6281: 1.0/1.2/1.5, 200, x2, x2, o, o, o, 50
+ * MHz TCLK GbE SATA TDMI Audio MTS GPIO TSens TWSI
+ * 6180: 600/800, 166, x1, -, -, o, -, 30, -, x1
+ * 6190: 600, 166, *x2, x1, -, -, -, 36, -, x1
+ * 6192: 800, 166, x2, x2, o, o, o, 36, -, x1
+ * 6281: 1.0/1.2/1.5, 200, x2, x2, o, o, o, 50, -, x1
+ * 6282: ?-2.0, 200, x2, x2, o, o, o, 50, o, x2
+ *
+ * * GbE x1 + 100BT x1
*/
#define KIRKWOOD_UNITID_DDR MVSOC_UNITID_DDR
@@ -92,6 +95,7 @@
#define KIRKWOOD_IRQ_TWSI 29 /* TWSI interrupt */
#define KIRKWOOD_IRQ_AVBINT 30 /* AVB Interrupt */
#define KIRKWOOD_IRQ_TDMINT 31 /* TDM Interrupt */
+#define KIRKWOOD_IRQ_TWSI1 32 /* TWSI1 interrupt */
#define KIRKWOOD_IRQ_UART0INT 33 /* UART0 */
#define KIRKWOOD_IRQ_UART1INT 34 /* UART1 */
#define KIRKWOOD_IRQ_GPIOLO7_0 35 /* GPIO Low[7:0] */
@@ -162,6 +166,11 @@
/*
+ * Two-Wire Serial Interface Registers
+ */
+#define KIRKWOOD_TWSI1_BASE (MVSOC_TWSI_BASE + 0x0100)
+
+/*
* PCI-Express Interface Registers
*/
#define KIRKWOOD_PEX1_BASE (MVSOC_PEX_BASE + 0x4000)
