The patch titled
BCM1480 serial build fix
has been removed from the -mm tree. Its filename was
bcm1480-serial-build-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: BCM1480 serial build fix
From: Thiemo Seufer <ths@xxxxxxxxxxxx>
Restores serial functionality for the BCM1480.
Signed-off-by: Thiemo Seufer <ths@xxxxxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/sb1250-duart.c | 6 ++++++
include/asm-mips/sibyte/bcm1480_regs.h | 5 +++++
2 files changed, 11 insertions(+)
diff -puN drivers/serial/sb1250-duart.c~bcm1480-serial-build-fix drivers/serial/sb1250-duart.c
--- a/drivers/serial/sb1250-duart.c~bcm1480-serial-build-fix
+++ a/drivers/serial/sb1250-duart.c
@@ -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>
diff -puN include/asm-mips/sibyte/bcm1480_regs.h~bcm1480-serial-build-fix include/asm-mips/sibyte/bcm1480_regs.h
--- a/include/asm-mips/sibyte/bcm1480_regs.h~bcm1480-serial-build-fix
+++ a/include/asm-mips/sibyte/bcm1480_regs.h
@@ -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)))
_
Patches currently in -mm which might be from ths@xxxxxxxxxxxx are
origin.patch
git-mips.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
