tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
BCM1480 serial build fix
Restores serial functionality for the BCM1480.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Thiemo Seufer
and committed by
Linus Torvalds
719b6f29
f9b5a5d1
+11
+6
drivers/serial/sb1250-duart.c
+6
drivers/serial/sb1250-duart.c
···
58
58
#define SBD_CTRLREGS(line) A_BCM1480_DUART_CTRLREG((line), 0)
59
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
67
#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
62
68
#include <asm/sibyte/sb1250_regs.h>
63
69
#include <asm/sibyte/sb1250_int.h>
+5
include/asm-mips/sibyte/bcm1480_regs.h
+5
include/asm-mips/sibyte/bcm1480_regs.h
···
227
227
(A_BCM1480_DUART(chan) + \
228
228
BCM1480_DUART_CHANREG_SPACING * 3 + (reg))
229
229
230
+
#define DUART_IMRISR_SPACING 0x20
231
+
#define DUART_INCHNG_SPACING 0x10
232
+
230
233
#define R_BCM1480_DUART_IMRREG(chan) \
231
234
(R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING)
232
235
#define R_BCM1480_DUART_ISRREG(chan) \
233
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
240
#define A_BCM1480_DUART_IMRREG(chan) \
236
241
(A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan)))