aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2007-12-24 21:17:56 +0000
committerJohn Crispin <john@openwrt.org>2007-12-24 21:17:56 +0000
commit01e9b18190bd0248930f86ea0f56d73c6b7740bc (patch)
treef86990e34de91c41e91d180b4645e4a47abf53bf
parent8161d42238d31b7f4845e363ab8788eb1af9465f (diff)
downloadupstream-01e9b18190bd0248930f86ea0f56d73c6b7740bc.tar.gz
upstream-01e9b18190bd0248930f86ea0f56d73c6b7740bc.tar.bz2
upstream-01e9b18190bd0248930f86ea0f56d73c6b7740bc.zip
several fixes to ifxmips, getting ready for dsl driver merge
SVN-Revision: 9895
-rw-r--r--target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h12
-rw-r--r--target/linux/ifxmips/patches/110-drivers.patch2
2 files changed, 10 insertions, 4 deletions
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h
index 18e521b0ce..21d72a2b9e 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h
@@ -107,7 +107,7 @@
#define IFXMIPS_RCU_RST_REQ_DFE (1 << 7)
#define IFXMIPS_RCU_RST_REQ_AFE (1 << 11)
-
+#define IFXMIPS_RCU_RST_REQ_ARC_JTAG (1 << 20)
/*------------ MCD */
@@ -189,10 +189,10 @@
#define ETHERNET_PACKET_DMA_BUFFER_SIZE 0x600
-#define IFXMIPS_PPE32_MEM_MAP (IFXMIPS_PPE32_BASE_ADDR + 0x10000 )
+#define IFXMIPS_PPE32_MEM_MAP ((u32*)(IFXMIPS_PPE32_BASE_ADDR + 0x10000))
+#define IFXMIPS_PPE32_SRST ((u32*)(IFXMIPS_PPE32_BASE_ADDR + 0x10080))
#define MII_MODE 1
-
#define REV_MII_MODE 2
/* mdio access */
@@ -420,4 +420,10 @@
#define MEI_XMEM_BAR15 ((u32*)(IFXMIPS_MEI_BASE_ADDR + 0x0090))
#define MEI_XMEM_BAR16 ((u32*)(IFXMIPS_MEI_BASE_ADDR + 0x0094))
+
+/*------------ FUSE */
+
+#define IFXMIPS_FUSE_BASE_ADDR (KSEG1 + 0x1F107354)
+
+
#endif
diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch
index effe6b287b..69c935650e 100644
--- a/target/linux/ifxmips/patches/110-drivers.patch
+++ b/target/linux/ifxmips/patches/110-drivers.patch
@@ -91,4 +91,4 @@ Index: linux-2.6.23/drivers/char/Makefile
+obj-$(CONFIG_IFXMIPS_GPIO) += ifxmips_gpio.o
+obj-$(CONFIG_IFXMIPS_SSC) += ifxmips_ssc.o
+obj-$(CONFIG_IFXMIPS_EEPROM) += ifxmips_eeprom.o
-+obj-$(CONFIG_IFXMIPS_MEI) += ifxmips_mei_core.o ifxmips_mei_bsp.c ifxmips_mei_mib.c
++obj-$(CONFIG_IFXMIPS_MEI) += ifxmips_mei_core.o ifxmips_mei_bsp.o ifxmips_mei_mib.o