Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 719b6f29 authored by Thiemo Seufer's avatar Thiemo Seufer Committed by Linus Torvalds
Browse files

BCM1480 serial build fix 



Restores serial functionality for the BCM1480.

Signed-off-by: default avatarThiemo Seufer <ths@networkno.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9b5a5d1

drivers/serial/sb1250-duart.c

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ 
#define SBD_CTRLREGS(line)	A_BCM1480_DUART_CTRLREG((line), 0)

#define SBD_INT(line)		(K_BCM1480_INT_UART_0 + (line))



#define DUART_CHANREG_SPACING	BCM1480_DUART_CHANREG_SPACING



#define R_DUART_IMRREG(line)	R_BCM1480_DUART_IMRREG(line)

#define R_DUART_INCHREG(line)	R_BCM1480_DUART_INCHREG(line)

#define R_DUART_ISRREG(line)	R_BCM1480_DUART_ISRREG(line)



#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)

#include <asm/sibyte/sb1250_regs.h>

#include <asm/sibyte/sb1250_int.h>

include/asm-mips/sibyte/bcm1480_regs.h

+5 −0
Original line number Diff line number Diff line
@@ -227,10 +227,15 @@ 
	(A_BCM1480_DUART(chan) +					\

	 BCM1480_DUART_CHANREG_SPACING * 3 + (reg))



#define DUART_IMRISR_SPACING	    0x20

#define DUART_INCHNG_SPACING	    0x10



#define R_BCM1480_DUART_IMRREG(chan)					\

	(R_DUART_IMR_A + ((chan) & 1) * DUART_IMRISR_SPACING)

#define R_BCM1480_DUART_ISRREG(chan)					\

	(R_DUART_ISR_A + ((chan) & 1) * DUART_IMRISR_SPACING)

#define R_BCM1480_DUART_INCHREG(chan)					\

	(R_DUART_IN_CHNG_A + ((chan) & 1) * DUART_INCHNG_SPACING)



#define A_BCM1480_DUART_IMRREG(chan)					\

	(A_BCM1480_DUART_CTRLREG((chan), R_BCM1480_DUART_IMRREG(chan)))