[MIPS] rbtx4938: misc cleanups

[linux-2.6-omap-h63xx.git] / include / asm-mips / tx4938 / tx4938.h

diff --git a/include/asm-mips/tx4938/tx4938.h b/include/asm-mips/tx4938/tx4938.h
index afdb19813ca1b7082966a39eff6d68391048fefd..e8807f5c61e9bb2ee012a90f775950208cd64373 100644 (file)
--- a/include/asm-mips/tx4938/tx4938.h
+++ b/include/asm-mips/tx4938/tx4938.h
@@ -13,10 +13,8 @@
 #ifndef __ASM_TX_BOARDS_TX4938_H
 #define __ASM_TX_BOARDS_TX4938_H
 
-#include <asm/tx4938/tx4938_mips.h>
-
 #define tx4938_read_nfmc(addr) (*(volatile unsigned int *)(addr))
-#define tx4938_write_nfmc(b,addr) (*(volatile unsigned int *)(addr)) = (b)
+#define tx4938_write_nfmc(b, addr) (*(volatile unsigned int *)(addr)) = (b)
 
 #define TX4938_NR_IRQ_LOCAL     TX4938_IRQ_PIC_BEG
 
@@ -54,28 +52,6 @@
 #define TX4938_ACLC_REG                (TX4938_REG_BASE + 0xf700)
 #define TX4938_SPI_REG         (TX4938_REG_BASE + 0xf800)
 
-#ifndef _LANGUAGE_ASSEMBLY
-#include <asm/byteorder.h>
-
-#define TX4938_MKA(x) ((u32)( ((u32)(TX4938_REG_BASE)) | ((u32)(x)) ))
-
-#define TX4938_RD08( reg      )   (*(vu08*)(reg))
-#define TX4938_WR08( reg, val )  ((*(vu08*)(reg))=(val))
-
-#define TX4938_RD16( reg      )   (*(vu16*)(reg))
-#define TX4938_WR16( reg, val )  ((*(vu16*)(reg))=(val))
-
-#define TX4938_RD32( reg      )   (*(vu32*)(reg))
-#define TX4938_WR32( reg, val )  ((*(vu32*)(reg))=(val))
-
-#define TX4938_RD64( reg      )   (*(vu64*)(reg))
-#define TX4938_WR64( reg, val )  ((*(vu64*)(reg))=(val))
-
-#define TX4938_RD( reg      ) TX4938_RD32( reg )
-#define TX4938_WR( reg, val ) TX4938_WR32( reg, val )
-
-#endif /* !__ASSEMBLY__ */
-
 #ifdef __ASSEMBLY__
 #define _CONST64(c)    c
 #else
@@ -84,27 +60,27 @@
 #include <asm/byteorder.h>
 
 #ifdef __BIG_ENDIAN
-#define endian_def_l2(e1,e2)   \
-       volatile unsigned long e1,e2
-#define endian_def_s2(e1,e2)   \
-       volatile unsigned short e1,e2
-#define endian_def_sb2(e1,e2,e3)       \
-       volatile unsigned short e1;volatile unsigned char e2,e3
-#define endian_def_b2s(e1,e2,e3)       \
-       volatile unsigned char e1,e2;volatile unsigned short e3
-#define endian_def_b4(e1,e2,e3,e4)     \
-       volatile unsigned char e1,e2,e3,e4
+#define endian_def_l2(e1, e2)  \
+       volatile unsigned long e1, e2
+#define endian_def_s2(e1, e2)  \
+       volatile unsigned short e1, e2
+#define endian_def_sb2(e1, e2, e3)     \
+       volatile unsigned short e1;volatile unsigned char e2, e3
+#define endian_def_b2s(e1, e2, e3)     \
+       volatile unsigned char e1, e2;volatile unsigned short e3
+#define endian_def_b4(e1, e2, e3, e4)  \
+       volatile unsigned char e1, e2, e3, e4
 #else
-#define endian_def_l2(e1,e2)   \
-       volatile unsigned long e2,e1
-#define endian_def_s2(e1,e2)   \
-       volatile unsigned short e2,e1
-#define endian_def_sb2(e1,e2,e3)       \
-       volatile unsigned char e3,e2;volatile unsigned short e1
-#define endian_def_b2s(e1,e2,e3)       \
-       volatile unsigned short e3;volatile unsigned char e2,e1
-#define endian_def_b4(e1,e2,e3,e4)     \
-       volatile unsigned char e4,e3,e2,e1
+#define endian_def_l2(e1, e2)  \
+       volatile unsigned long e2, e1
+#define endian_def_s2(e1, e2)  \
+       volatile unsigned short e2, e1
+#define endian_def_sb2(e1, e2, e3)     \
+       volatile unsigned char e3, e2;volatile unsigned short e1
+#define endian_def_b2s(e1, e2, e3)     \
+       volatile unsigned short e3;volatile unsigned char e2, e1
+#define endian_def_b4(e1, e2, e3, e4)  \
+       volatile unsigned char e4, e3, e2, e1
 #endif
 
 
@@ -261,18 +237,6 @@ struct tx4938_sio_reg {
        volatile unsigned long rfifo;
 };
 
-struct tx4938_pio_reg {
-       volatile unsigned long dout;
-       volatile unsigned long din;
-       volatile unsigned long dir;
-       volatile unsigned long od;
-       volatile unsigned long flag[2];
-       volatile unsigned long pol;
-       volatile unsigned long intc;
-       volatile unsigned long maskcpu;
-       volatile unsigned long maskext;
-};
-
 struct tx4938_ndfmc_reg {
        endian_def_l2(unused0, dtr);
        endian_def_l2(unused1, mcr);
@@ -354,7 +318,7 @@ struct tx4938_ccfg_reg {
 #define TX4938_NUM_IR_SIO      2
 #define TX4938_IR_SIO(n)       (8 + (n))
 #define TX4938_NUM_IR_DMA      4
-#define TX4938_IR_DMA(ch,n)    ((ch ? 27 : 10) + (n)) /* 10-13,27-30 */
+#define TX4938_IR_DMA(ch, n)   ((ch ? 27 : 10) + (n)) /* 10-13, 27-30 */
 #define TX4938_IR_PIO  14
 #define TX4938_IR_PDMAC        15
 #define TX4938_IR_PCIC 16
@@ -641,9 +605,8 @@ struct tx4938_ccfg_reg {
 #define tx4938_pcicptr         ((struct tx4938_pcic_reg *)TX4938_PCIC_REG)
 #define tx4938_pcic1ptr                ((struct tx4938_pcic_reg *)TX4938_PCIC1_REG)
 #define tx4938_ccfgptr         ((struct tx4938_ccfg_reg *)TX4938_CCFG_REG)
-#define tx4938_tmrptr(ch)      ((struct tx4938_tmr_reg *)TX4938_TMR_REG(ch))
 #define tx4938_sioptr(ch)      ((struct tx4938_sio_reg *)TX4938_SIO_REG(ch))
-#define tx4938_pioptr          ((struct tx4938_pio_reg *)TX4938_PIO_REG)
+#define tx4938_pioptr          ((struct txx9_pio_reg __iomem *)TX4938_PIO_REG)
 #define tx4938_aclcptr         ((struct tx4938_aclc_reg *)TX4938_ACLC_REG)
 #define tx4938_spiptr          ((struct tx4938_spi_reg *)TX4938_SPI_REG)
 #define tx4938_sramcptr                ((struct tx4938_sramc_reg *)TX4938_SRAMC_REG)