diff options
Diffstat (limited to 'include/asm-mips/tx4938')
-rw-r--r-- | include/asm-mips/tx4938/rbtx4938.h | 2 | ||||
-rw-r--r-- | include/asm-mips/tx4938/tx4938.h | 44 | ||||
-rw-r--r-- | include/asm-mips/tx4938/tx4938_mips.h | 8 |
3 files changed, 27 insertions, 27 deletions
diff --git a/include/asm-mips/tx4938/rbtx4938.h b/include/asm-mips/tx4938/rbtx4938.h index b14acb575be2..b180488dcdc4 100644 --- a/include/asm-mips/tx4938/rbtx4938.h +++ b/include/asm-mips/tx4938/rbtx4938.h | |||
@@ -153,7 +153,7 @@ | |||
153 | #define RBTX4938_IRQ_IRC_WTOERR (RBTX4938_IRQ_IRC + TX4938_IR_WTOERR) | 153 | #define RBTX4938_IRQ_IRC_WTOERR (RBTX4938_IRQ_IRC + TX4938_IR_WTOERR) |
154 | #define RBTX4938_IRQ_IRC_INT(n) (RBTX4938_IRQ_IRC + TX4938_IR_INT(n)) | 154 | #define RBTX4938_IRQ_IRC_INT(n) (RBTX4938_IRQ_IRC + TX4938_IR_INT(n)) |
155 | #define RBTX4938_IRQ_IRC_SIO(n) (RBTX4938_IRQ_IRC + TX4938_IR_SIO(n)) | 155 | #define RBTX4938_IRQ_IRC_SIO(n) (RBTX4938_IRQ_IRC + TX4938_IR_SIO(n)) |
156 | #define RBTX4938_IRQ_IRC_DMA(ch,n) (RBTX4938_IRQ_IRC + TX4938_IR_DMA(ch,n)) | 156 | #define RBTX4938_IRQ_IRC_DMA(ch, n) (RBTX4938_IRQ_IRC + TX4938_IR_DMA(ch, n)) |
157 | #define RBTX4938_IRQ_IRC_PIO (RBTX4938_IRQ_IRC + TX4938_IR_PIO) | 157 | #define RBTX4938_IRQ_IRC_PIO (RBTX4938_IRQ_IRC + TX4938_IR_PIO) |
158 | #define RBTX4938_IRQ_IRC_PDMAC (RBTX4938_IRQ_IRC + TX4938_IR_PDMAC) | 158 | #define RBTX4938_IRQ_IRC_PDMAC (RBTX4938_IRQ_IRC + TX4938_IR_PDMAC) |
159 | #define RBTX4938_IRQ_IRC_PCIC (RBTX4938_IRQ_IRC + TX4938_IR_PCIC) | 159 | #define RBTX4938_IRQ_IRC_PCIC (RBTX4938_IRQ_IRC + TX4938_IR_PCIC) |
diff --git a/include/asm-mips/tx4938/tx4938.h b/include/asm-mips/tx4938/tx4938.h index afdb19813ca1..650b010761f9 100644 --- a/include/asm-mips/tx4938/tx4938.h +++ b/include/asm-mips/tx4938/tx4938.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <asm/tx4938/tx4938_mips.h> | 16 | #include <asm/tx4938/tx4938_mips.h> |
17 | 17 | ||
18 | #define tx4938_read_nfmc(addr) (*(volatile unsigned int *)(addr)) | 18 | #define tx4938_read_nfmc(addr) (*(volatile unsigned int *)(addr)) |
19 | #define tx4938_write_nfmc(b,addr) (*(volatile unsigned int *)(addr)) = (b) | 19 | #define tx4938_write_nfmc(b, addr) (*(volatile unsigned int *)(addr)) = (b) |
20 | 20 | ||
21 | #define TX4938_NR_IRQ_LOCAL TX4938_IRQ_PIC_BEG | 21 | #define TX4938_NR_IRQ_LOCAL TX4938_IRQ_PIC_BEG |
22 | 22 | ||
@@ -84,27 +84,27 @@ | |||
84 | #include <asm/byteorder.h> | 84 | #include <asm/byteorder.h> |
85 | 85 | ||
86 | #ifdef __BIG_ENDIAN | 86 | #ifdef __BIG_ENDIAN |
87 | #define endian_def_l2(e1,e2) \ | 87 | #define endian_def_l2(e1, e2) \ |
88 | volatile unsigned long e1,e2 | 88 | volatile unsigned long e1, e2 |
89 | #define endian_def_s2(e1,e2) \ | 89 | #define endian_def_s2(e1, e2) \ |
90 | volatile unsigned short e1,e2 | 90 | volatile unsigned short e1, e2 |
91 | #define endian_def_sb2(e1,e2,e3) \ | 91 | #define endian_def_sb2(e1, e2, e3) \ |
92 | volatile unsigned short e1;volatile unsigned char e2,e3 | 92 | volatile unsigned short e1;volatile unsigned char e2, e3 |
93 | #define endian_def_b2s(e1,e2,e3) \ | 93 | #define endian_def_b2s(e1, e2, e3) \ |
94 | volatile unsigned char e1,e2;volatile unsigned short e3 | 94 | volatile unsigned char e1, e2;volatile unsigned short e3 |
95 | #define endian_def_b4(e1,e2,e3,e4) \ | 95 | #define endian_def_b4(e1, e2, e3, e4) \ |
96 | volatile unsigned char e1,e2,e3,e4 | 96 | volatile unsigned char e1, e2, e3, e4 |
97 | #else | 97 | #else |
98 | #define endian_def_l2(e1,e2) \ | 98 | #define endian_def_l2(e1, e2) \ |
99 | volatile unsigned long e2,e1 | 99 | volatile unsigned long e2, e1 |
100 | #define endian_def_s2(e1,e2) \ | 100 | #define endian_def_s2(e1, e2) \ |
101 | volatile unsigned short e2,e1 | 101 | volatile unsigned short e2, e1 |
102 | #define endian_def_sb2(e1,e2,e3) \ | 102 | #define endian_def_sb2(e1, e2, e3) \ |
103 | volatile unsigned char e3,e2;volatile unsigned short e1 | 103 | volatile unsigned char e3, e2;volatile unsigned short e1 |
104 | #define endian_def_b2s(e1,e2,e3) \ | 104 | #define endian_def_b2s(e1, e2, e3) \ |
105 | volatile unsigned short e3;volatile unsigned char e2,e1 | 105 | volatile unsigned short e3;volatile unsigned char e2, e1 |
106 | #define endian_def_b4(e1,e2,e3,e4) \ | 106 | #define endian_def_b4(e1, e2, e3, e4) \ |
107 | volatile unsigned char e4,e3,e2,e1 | 107 | volatile unsigned char e4, e3, e2, e1 |
108 | #endif | 108 | #endif |
109 | 109 | ||
110 | 110 | ||
@@ -354,7 +354,7 @@ struct tx4938_ccfg_reg { | |||
354 | #define TX4938_NUM_IR_SIO 2 | 354 | #define TX4938_NUM_IR_SIO 2 |
355 | #define TX4938_IR_SIO(n) (8 + (n)) | 355 | #define TX4938_IR_SIO(n) (8 + (n)) |
356 | #define TX4938_NUM_IR_DMA 4 | 356 | #define TX4938_NUM_IR_DMA 4 |
357 | #define TX4938_IR_DMA(ch,n) ((ch ? 27 : 10) + (n)) /* 10-13,27-30 */ | 357 | #define TX4938_IR_DMA(ch, n) ((ch ? 27 : 10) + (n)) /* 10-13, 27-30 */ |
358 | #define TX4938_IR_PIO 14 | 358 | #define TX4938_IR_PIO 14 |
359 | #define TX4938_IR_PDMAC 15 | 359 | #define TX4938_IR_PDMAC 15 |
360 | #define TX4938_IR_PCIC 16 | 360 | #define TX4938_IR_PCIC 16 |
diff --git a/include/asm-mips/tx4938/tx4938_mips.h b/include/asm-mips/tx4938/tx4938_mips.h index 5f8498fef005..f346ff58b947 100644 --- a/include/asm-mips/tx4938/tx4938_mips.h +++ b/include/asm-mips/tx4938/tx4938_mips.h | |||
@@ -19,10 +19,10 @@ | |||
19 | #define reg_rd32(r) ((u32)(*((vu32*)(r)))) | 19 | #define reg_rd32(r) ((u32)(*((vu32*)(r)))) |
20 | #define reg_rd64(r) ((u64)(*((vu64*)(r)))) | 20 | #define reg_rd64(r) ((u64)(*((vu64*)(r)))) |
21 | 21 | ||
22 | #define reg_wr08(r,v) ((*((vu8 *)(r)))=((u8 )(v))) | 22 | #define reg_wr08(r, v) ((*((vu8 *)(r)))=((u8 )(v))) |
23 | #define reg_wr16(r,v) ((*((vu16*)(r)))=((u16)(v))) | 23 | #define reg_wr16(r, v) ((*((vu16*)(r)))=((u16)(v))) |
24 | #define reg_wr32(r,v) ((*((vu32*)(r)))=((u32)(v))) | 24 | #define reg_wr32(r, v) ((*((vu32*)(r)))=((u32)(v))) |
25 | #define reg_wr64(r,v) ((*((vu64*)(r)))=((u64)(v))) | 25 | #define reg_wr64(r, v) ((*((vu64*)(r)))=((u64)(v))) |
26 | 26 | ||
27 | typedef volatile __signed char vs8; | 27 | typedef volatile __signed char vs8; |
28 | typedef volatile unsigned char vu8; | 28 | typedef volatile unsigned char vu8; |