lots of ifxmips cleanups

[openwrt/svn-archive/archive.git] / target / linux / ifxmips / files / include / asm-mips / ifxmips / ifxmips.h

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 3ab53aebb08825dcdcc4d1605134fbacfcd7742c..3a8c3f64fd2c2ea04ba2e844810fc720fc6e0ff9 100644 (file)
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips.h
@@ -22,6 +22,7 @@
 
 #define ifxmips_r32(reg) __raw_readl(reg)
 #define ifxmips_w32(val,reg) __raw_writel(val,reg)
+#define ifxmips_w32_mask(clear,set,reg)        ifxmips_w32((ifxmips_r32(reg) & ~clear) | set, reg)
 
 /*------------ GENERAL */
 
@@ -87,13 +88,6 @@
 #define IFXMIPS_RCU_RST_REQ_AFE        (1 << 11)
 #define IFXMIPS_RCU_RST_REQ_ARC_JTAG   (1 << 20)
 
-/*------------ MCD */
-
-#define IFXMIPS_MCD_BASE_ADDR  (KSEG1 + 0x1F106000)
-
-/* chip id */
-#define IFXMIPS_MCD_CHIPID             ((u32*)(IFXMIPS_MCD_BASE_ADDR + 0x0028))
-
 
 /*------------ GPTU */