Module Name: src
Committed By: rkujawa
Date: Wed May 1 12:23:24 UTC 2013
Modified Files:
src/sys/dev/marvell: marvellreg.h
Log Message:
Add IDs for Marvell Armada XP and ATTR_SDRAM registers used with IO cache
coherency.
Obtained from Marvell, Semihalf.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/marvell/marvellreg.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/dev/marvell/marvellreg.h
diff -u src/sys/dev/marvell/marvellreg.h:1.6 src/sys/dev/marvell/marvellreg.h:1.7
--- src/sys/dev/marvell/marvellreg.h:1.6 Thu Jul 12 09:39:53 2012
+++ src/sys/dev/marvell/marvellreg.h Wed May 1 12:23:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: marvellreg.h,v 1.6 2012/07/12 09:39:53 kiyohara Exp $ */
+/* $NetBSD: marvellreg.h,v 1.7 2013/05/01 12:23:24 rkujawa Exp $ */
/*
* Copyright (c) 2009 KIYOHARA Takashi
* All rights reserved.
@@ -59,14 +59,26 @@
#define MARVELL_MV78XX0_MV78100 PCI_PRODUCT_MARVELL_MV78100
#define MARVELL_MV78XX0_MV78200 PCI_PRODUCT_MARVELL_MV78200
+#define MARVELL_ARMADAXP_MV78130 PCI_PRODUCT_MARVELL_MV78130
+#define MARVELL_ARMADAXP_MV78160 PCI_PRODUCT_MARVELL_MV78160
+#define MARVELL_ARMADAXP_MV78230 PCI_PRODUCT_MARVELL_MV78230
+#define MARVELL_ARMADAXP_MV78260 PCI_PRODUCT_MARVELL_MV78260
+#define MARVELL_ARMADAXP_MV78460 PCI_PRODUCT_MARVELL_MV78460
+
#define MARVELL_DISCOVERY_REVA 0x10
#define MARVELL_DISCOVERY_REVB 0x20
-
#define MARVELL_ATTR_MASK 0xff
+#ifdef AURORA_IO_CACHE_COHERENCY
+#define MARVELL_ATTR_SDRAM_CS0 0x1e
+#define MARVELL_ATTR_SDRAM_CS1 0x1d
+#define MARVELL_ATTR_SDRAM_CS2 0x1b
+#define MARVELL_ATTR_SDRAM_CS3 0x17
+#else
#define MARVELL_ATTR_SDRAM_CS0 0x0e
#define MARVELL_ATTR_SDRAM_CS1 0x0d
#define MARVELL_ATTR_SDRAM_CS2 0x0b
#define MARVELL_ATTR_SDRAM_CS3 0x07
+#endif
#endif /* _DEV_MARVELL_MARVELLREG_H_ */
