diff options
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 11 | ||||
| -rw-r--r-- | include/asm-arm/arch-lh7a40x/serial.h | 25 |
2 files changed, 9 insertions, 27 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index d863368e45e2..8aa264f4cb42 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c @@ -45,8 +45,6 @@ #include <linux/serial_core.h> -#include <asm/arch/serial.h> - #define DEV_MAJOR 204 #define DEV_MINOR 16 #define DEV_NR 3 @@ -60,6 +58,15 @@ #define UART_REG_SIZE 32 +#define UART_R_DATA (0x00) +#define UART_R_FCON (0x04) +#define UART_R_BRCON (0x08) +#define UART_R_CON (0x0c) +#define UART_R_STATUS (0x10) +#define UART_R_RAWISR (0x14) +#define UART_R_INTEN (0x18) +#define UART_R_ISR (0x1c) + #define UARTEN (0x01) /* UART enable */ #define SIRDIS (0x02) /* Serial IR disable (UART1 only) */ diff --git a/include/asm-arm/arch-lh7a40x/serial.h b/include/asm-arm/arch-lh7a40x/serial.h deleted file mode 100644 index 64783c05fb92..000000000000 --- a/include/asm-arm/arch-lh7a40x/serial.h +++ /dev/null @@ -1,25 +0,0 @@ -/* include/asm-arm/arch-lh7a40x/serial.h - * - * Copyright (C) 2004 Coastal Environmental Systems - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - */ - -#ifndef __ASM_ARCH_SERIAL_H -#define __ASM_ARCH_SERIAL_H - -#include <asm/arch/registers.h> - -#define UART_R_DATA (0x00) -#define UART_R_FCON (0x04) -#define UART_R_BRCON (0x08) -#define UART_R_CON (0x0c) -#define UART_R_STATUS (0x10) -#define UART_R_RAWISR (0x14) -#define UART_R_INTEN (0x18) -#define UART_R_ISR (0x1c) - -#endif /* _ASM_ARCH_SERIAL_H */ |