tty: move drivers/serial/ to drivers/tty/serial/

The serial drivers are really just tty drivers, so move them to
drivers/tty/ to make things a bit neater overall.

This is part of the tty/serial driver movement proceedure as proposed by
Arnd Bergmann and approved by everyone involved a number of months ago.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Rogier Wolff <R.E.Wolff@bitwizard.nl>
Cc: Michael H. Warfield <mhw@wittsend.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 64 insertions, 0 deletions

diff --git a/drivers/tty/serial/apbuart.h b/drivers/tty/serial/apbuart.h
new file mode 100644
index 000000000000..5faf87c8d2bc
--- /dev/null
+++ b/drivers/tty/serial/apbuart.h
@@ -0,0 +1,64 @@
+#ifndef __GRLIB_APBUART_H__
+#define __GRLIB_APBUART_H__
+
+#include <asm/io.h>
+
+#define UART_NR         8
+static int grlib_apbuart_port_nr;
+
+struct grlib_apbuart_regs_map {
+        u32 data;
+        u32 status;
+        u32 ctrl;
+        u32 scaler;
+};
+
+struct amba_prom_registers {
+        unsigned int phys_addr;
+        unsigned int reg_size;
+};
+
+/*
+ *  The following defines the bits in the APBUART Status Registers.
+ */
+#define UART_STATUS_DR   0x00000001     /* Data Ready */
+#define UART_STATUS_TSE  0x00000002     /* TX Send Register Empty */
+#define UART_STATUS_THE  0x00000004     /* TX Hold Register Empty */
+#define UART_STATUS_BR   0x00000008     /* Break Error */
+#define UART_STATUS_OE   0x00000010     /* RX Overrun Error */
+#define UART_STATUS_PE   0x00000020     /* RX Parity Error */
+#define UART_STATUS_FE   0x00000040     /* RX Framing Error */
+#define UART_STATUS_ERR  0x00000078     /* Error Mask */
+
+/*
+ *  The following defines the bits in the APBUART Ctrl Registers.
+ */
+#define UART_CTRL_RE     0x00000001     /* Receiver enable */
+#define UART_CTRL_TE     0x00000002     /* Transmitter enable */
+#define UART_CTRL_RI     0x00000004     /* Receiver interrupt enable */
+#define UART_CTRL_TI     0x00000008     /* Transmitter irq */
+#define UART_CTRL_PS     0x00000010     /* Parity select */
+#define UART_CTRL_PE     0x00000020     /* Parity enable */
+#define UART_CTRL_FL     0x00000040     /* Flow control enable */
+#define UART_CTRL_LB     0x00000080     /* Loopback enable */
+
+#define APBBASE(port) ((struct grlib_apbuart_regs_map *)((port)->membase))
+
+#define APBBASE_DATA_P(port)    (&(APBBASE(port)->data))
+#define APBBASE_STATUS_P(port)  (&(APBBASE(port)->status))
+#define APBBASE_CTRL_P(port)    (&(APBBASE(port)->ctrl))
+#define APBBASE_SCALAR_P(port)  (&(APBBASE(port)->scaler))
+
+#define UART_GET_CHAR(port)     (__raw_readl(APBBASE_DATA_P(port)))
+#define UART_PUT_CHAR(port, v)  (__raw_writel(v, APBBASE_DATA_P(port)))
+#define UART_GET_STATUS(port)   (__raw_readl(APBBASE_STATUS_P(port)))
+#define UART_PUT_STATUS(port, v)(__raw_writel(v, APBBASE_STATUS_P(port)))
+#define UART_GET_CTRL(port)     (__raw_readl(APBBASE_CTRL_P(port)))
+#define UART_PUT_CTRL(port, v)  (__raw_writel(v, APBBASE_CTRL_P(port)))
+#define UART_GET_SCAL(port)     (__raw_readl(APBBASE_SCALAR_P(port)))
+#define UART_PUT_SCAL(port, v)  (__raw_writel(v, APBBASE_SCALAR_P(port)))
+
+#define UART_RX_DATA(s)         (((s) & UART_STATUS_DR) != 0)
+#define UART_TX_READY(s)        (((s) & UART_STATUS_THE) != 0)
+
+#endif /* __GRLIB_APBUART_H__ */