diff options
author | Manuel Lauss <manuel.lauss@gmail.com> | 2014-03-27 02:42:29 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 04:16:53 -0400 |
commit | 61d3edb862716c4ab8d7d7fec48101b4d35e9e52 (patch) | |
tree | bd6ad05f907da9b7f7ae65648ff5779d811a96ad | |
parent | e60865572f81fb2687163fd37ea37cd4283e0bce (diff) |
MIPS: Alchemy: remove duplicate UART register offset definitions
The UART register names are identical to the ones in uapi/linux/serial_reg.h,
which causes build failures in various drivers when they indirectly pull in
the au1000.h header, for example via gpio.h:
In file included from arch/mips/include/asm/mach-au1x00/gpio.h:13:0,
from arch/mips/include/asm/gpio.h:4,
from include/linux/gpio.h:48,
from include/linux/ssb/ssb.h:9,
from drivers/ssb/driver_mipscore.c:11:
arch/mips/include/asm/mach-au1x00/au1000.h:1171:0: note: this is the location of the previous definition
#define UART_LSR 0x1C /* Line Status Register */
Get rid of the altogether, nothing in the core Alchemy code depends
on them any more.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/6664/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/mach-au1x00/au1000.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h index 54f9e84db8ac..b4c3ecb17d48 100644 --- a/arch/mips/include/asm/mach-au1x00/au1000.h +++ b/arch/mips/include/asm/mach-au1x00/au1000.h | |||
@@ -1161,18 +1161,6 @@ enum soc_au1200_ints { | |||
1161 | #define MAC_RX_BUFF3_STATUS 0x30 | 1161 | #define MAC_RX_BUFF3_STATUS 0x30 |
1162 | #define MAC_RX_BUFF3_ADDR 0x34 | 1162 | #define MAC_RX_BUFF3_ADDR 0x34 |
1163 | 1163 | ||
1164 | #define UART_RX 0 /* Receive buffer */ | ||
1165 | #define UART_TX 4 /* Transmit buffer */ | ||
1166 | #define UART_IER 8 /* Interrupt Enable Register */ | ||
1167 | #define UART_IIR 0xC /* Interrupt ID Register */ | ||
1168 | #define UART_FCR 0x10 /* FIFO Control Register */ | ||
1169 | #define UART_LCR 0x14 /* Line Control Register */ | ||
1170 | #define UART_MCR 0x18 /* Modem Control Register */ | ||
1171 | #define UART_LSR 0x1C /* Line Status Register */ | ||
1172 | #define UART_MSR 0x20 /* Modem Status Register */ | ||
1173 | #define UART_CLK 0x28 /* Baud Rate Clock Divider */ | ||
1174 | #define UART_MOD_CNTRL 0x100 /* Module Control */ | ||
1175 | |||
1176 | /* SSIO */ | 1164 | /* SSIO */ |
1177 | #define SSI0_STATUS 0xB1600000 | 1165 | #define SSI0_STATUS 0xB1600000 |
1178 | # define SSI_STATUS_BF (1 << 4) | 1166 | # define SSI_STATUS_BF (1 << 4) |