diff options
-rw-r--r-- | drivers/serial/sb1250-duart.c | 6 | ||||
-rw-r--r-- | include/asm-mips/sibyte/bcm1480_regs.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c index 201253755011..2d6c08b3dbcf 100644 --- a/drivers/serial/sb1250-duart.c +++ b/drivers/serial/sb1250-duart.c | |||
@@ -58,6 +58,12 @@ | |||
58 | #define SBD_CTRLREGS(line) A_BCM1480_DUART_CTRLREG((line), 0) | 58 | #define SBD_CTRLREGS(line) A_BCM1480_DUART_CTRLREG((line), 0) |
59 | #define SBD_INT(line) (K_BCM1480_INT_UART_0 + (line)) | 59 | #define SBD_INT(line) (K_BCM1480_INT_UART_0 + (line)) |
60 | 60 | ||
61 | #define DUART_CHANREG_SPACING BCM1480_DUART_CHANREG_SPACING | ||
62 | |||
63 | #define R_DUART_IMRREG(line) R_BCM1480_DUART_IMRREG(line) | ||
64 | #define R_DUART_INCHREG(line) R_BCM1480_DUART_INCHREG(line) | ||
65 | #define R_DUART_ISRREG(line) R_BCM1480_DUART_ISRREG(line) | ||
66 | |||
61 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) | 67 | #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) |
62 | #include <asm/sibyte/sb1250_regs.h> | 68 | #include <asm/sibyte/sb1250_regs.h> |
63 | #include <asm/sibyte/sb1250_int.h> | 69 | #include <asm/sibyte/sb1250_int.h> |
diff --git a/include/asm-mips/sibyte/bcm1480_regs.h b/include/asm-mips/sibyte/bcm1480_regs.h index 2738c1366f66..c34d36b6b8c2 100644 --- a/include/asm-mips/sibyte/bcm1480_regs.h +++ b/include/asm-mips/sibyte/bcm1480_regs.h | |||
@@ -227,10 +227,15 @@ | |||
227 | (A_BCM1480_DUART(chan) + \ | 227 | (A_BCM1480_DUART(chan) + \ |
228 | BCM1480_DUART_CHANREG_SPACING * 3 + (reg)) | 228 | BCM1480_DUART_CHANREG_SPACING * 3 + (reg)) |
229 | 229 | ||
230 | #define DUART_IMRISR_SPACING 0x20 | ||
231 | #define DUART_INCHNG_SPACING 0x10 | ||
232 | |||
230 | #define R_BCM1480_DUART_IMRREG(chan) \ | 233 | #define R_BCM1480_DUART_IMRREG(chan) \ |
231 | (R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING) | 234 | (R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING) |
232 | #define R_BCM1480_DUART_ISRREG(chan) \ | 235 | #define R_BCM1480_DUART_ISRREG(chan) \ |
233 | (R_DUART_ISR_A + ((chan) & 1) * DUART_IMRISR_SPACING) | 236 | (R_DUART_ISR_A + ((chan) & 1) * DUART_IMRISR_SPACING) |
237 | #define R_BCM1480_DUART_INCHREG(chan) \ | ||
238 | (R_DUART_IN_CHNG_A + ((chan) & 1) * DUART_INCHNG_SPACING) | ||
234 | 239 | ||
235 | #define A_BCM1480_DUART_IMRREG(chan) \ | 240 | #define A_BCM1480_DUART_IMRREG(chan) \ |
236 | (A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan))) | 241 | (A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan))) |