| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <OFC07ADC4E.56615520-ON48257592.00294953-48257592.00298F54@sunplusct.com>
Date: Wed, 8 Apr 2009 15:31:50 +0800
From: liqin.chen@...plusct.com
To: linux-arch@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: torvalds@...ux-foundation.org, Arnd Bergmann <arnd@...db.de>,
Sam Ravnborg <sam@...nborg.org>,
Thomas Gleixner <tglx@...utronix.de>,
Kyle McMartin <kyle@...artin.ca>
Subject: [PATCH 14/14] score - New architecure port to SunplusCT S+CORE
From: Chen Liqin <liqin.chen@...plusct.com>
drivers/serial/Kconfig, drivers/serial/Makefile,
drivers/serial/sct_serial.c, serial/sct_serial.h,
MAINTAINERS for the score architecture.
Signed off by: Chen Liqin <liqin.chen@...plusct.com>
Signed off by: Lennox Wu <lennox.wu@...plusct.com>
--
diff -uprN -x linux-2.6-git.ori/Documentation/dontdiff
linux-2.6-git.ori/drivers/serial/Kconfig
linux-2.6-git.new/drivers/serial/Kconfig
--- linux-2.6-git.ori/drivers/serial/Kconfig 2009-03-23
11:24:50.000000000 +0800
+++ linux-2.6-git.new/drivers/serial/Kconfig 2009-03-23
17:32:43.000000000 +0800
@@ -1412,4 +1412,31 @@ config SPORT_BAUD_RATE
default 19200 if (SERIAL_SPORT_BAUD_RATE_19200)
default 9600 if (SERIAL_SPORT_BAUD_RATE_9600)
+config SERIAL_SCT
+ tristate "SunplusCT compatible serial support"
+ depends on (SCORE)
+ select SERIAL_CORE
+ ---help---
+ Most people will say Y or M here, so that they can use serial
mice,
+ modems and similar devices connecting to the standard serial
ports.
+
+config SERIAL_SCT_CONSOLE
+ bool "Console on SunplusCT compatible serial port"
+ depends on (SERIAL_SCT)
+ select SERIAL_CORE_CONSOLE
+ ---help---
+ If you don't have a VGA card installed and you say Y here, the
+ kernel will automatically use the first serial line, /dev/ttyS0,
as
+ system console.
+
+ You can set that using a kernel command line option such as
+ "console=sct_uart,"
+ "console=uart,"
+ and it will switch to normal serial console when the
corresponding
+ port is ready.
+ "earlycon=sct_uart,"
+ "earlycon=uart,"
+ it will not only setup early console.
+
+ If unsure, say N.
endmenu
diff -uprN -x linux-2.6-git.ori/Documentation/dontdiff
linux-2.6-git.ori/drivers/serial/Makefile
linux-2.6-git.new/drivers/serial/Makefile
--- linux-2.6-git.ori/drivers/serial/Makefile 2009-03-23
11:24:50.000000000 +0800
+++ linux-2.6-git.new/drivers/serial/Makefile 2009-03-23
16:08:57.000000000 +0800
@@ -76,3 +76,4 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIA
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
+obj-$(CONFIG_SERIAL_SCT) += sct_serial.o
diff -uprN -x linux-2.6-git.ori/Documentation/dontdiff
linux-2.6-git.ori/drivers/serial/sct_serial.c
linux-2.6-git.new/drivers/serial/sct_serial.c
--- linux-2.6-git.ori/drivers/serial/sct_serial.c 1970-01-01
08:00:00.000000000 +0800
+++ linux-2.6-git.new/drivers/serial/sct_serial.c 2009-04-08
11:15:38.000000000 +0800
@@ -0,0 +1,546 @@
+/*
+ * File: linux/drivers/serial/sct_serial.c
+ *
+ * Based on: linux/drivers/serial/8250.c
+ * Author: Chang Yu-ming
+ *
+ * Created: Nov 29, 2008
+ * Copyright: (C) Sunplus Core Technology Co., Ltd.
+ * Description: Driver for SunplusCT Serial ports.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * Currently don't support modem line status...
+ * maybe the only 1 need to be care is CTS,
+ * DCD.DSR seems not too important
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#ifdef CONFIG_SERIAL_SCT_CONSOLE
+#include <linux/console.h>
+#endif
+#include <linux/platform_device.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial.h>
+#include <linux/serial_core.h>
+#include <asm/irq.h>
+#include <asm/irq.h>
+
+#include "sct_serial.h"
+
+
+/* DEBUG macro*/
+/*
+#define DEBUG_MESSAGE 0
+#if DEBUG_MESSAGE == 1
+#define DEBUG(args...) printk(args)
+#else
+#define DEBUG(args...)
+#endif
+*/
+
+#ifdef CONFIG_SCORE_SIM
+static void send_char(char c)
+{
+ writeb(c, UART_THR);
+ if (c == '\n')
+ writeb('\r', UART_THR);
+}
+#endif
+
+/* send a character to an UART */
+static void
+sct_uart_putc(struct uart_port *port, unsigned char c)
+{
+#ifdef CONFIG_SCORE_SIM
+ send_char(c);
+#else
+ unsigned int base = port->mapbase;
+
+ /* wait until not busy */
+ while (readw(UART_ST(base)) & UART_ST_BY);
+ writeb(c, UART_DR(base));
+
+ if (c == '\n') {
+ while (readw(UART_ST(base)) & UART_ST_BY);
+ writeb('\r', UART_DR(base));
+ }
+#endif
+}
+
+/* get a character from an UART */
+static unsigned char
+sct_uart_getc(struct uart_port *port)
+{
+ unsigned int base = port->mapbase;
+
+#ifdef CONFIG_SCORE_SIM
+ return readb(UART_RBR);
+#else
+ /* wait until receive FIFO is not empty */
+ while (readw(UART_ST(base)) & UART_ST_RE);
+ return readb(UART_DR(base));
+#endif
+}
+
+/* Receive interrupt handler */
+static irqreturn_t
+sct_uart_rxint(int irq, void *dev_id)
+{
+ struct uart_port *port = (struct uart_port *) dev_id;
+ struct tty_struct *tty = port->info->port.tty;
+ unsigned int data, status, base = port->mapbase;
+
+#ifdef CONFIG_SCORE_SIM
+ if (readw(UART_LSR) & 1) {
+ data = readb(UART_RBR);
+ tty_insert_flip_char(tty, data, 0);
+ }
+#else
+ do {
+ data = sct_uart_getc(port);
+ status = readw(UART_ERR(base)) & 0xf;
+ switch (status) {
+ case UART_ERR_OE:
+ status = TTY_OVERRUN;
+ break;
+ case UART_ERR_BE:
+ status = TTY_BREAK;
+ break;
+ case UART_ERR_PE:
+ status = TTY_PARITY;
+ break;
+ case UART_ERR_FE:
+ status = TTY_FRAME;
+ break;
+ default:
+ status = 0;
+ }
+
+ tty_insert_flip_char(tty, data, status);
+ } while (!(readw(UART_ST(base)) & UART_ST_RE));
+#endif
+ tty_flip_buffer_push(tty);
+ return IRQ_HANDLED;
+}
+
+/*
+ * Claim the memory region attached to a UART port.
+ * Called when the driver adds an UART port via
+ * uart_add_one_port().
+ */
+static int
+sct_uart_request_port(struct uart_port *port)
+{
+ if (!request_mem_region(port->mapbase, UART_REGISTER_SPACE,
"sct_uart"))
+ return -EBUSY;
+
+ return 0;
+}
+
+/*
+ * Release the memory region attached to a UART port.
+ * Called when the driver removes an UART port via
+ * uart_remove_one_port().
+ */
+static void
+sct_uart_release_port(struct uart_port *port)
+{
+ release_mem_region(port->mapbase, UART_REGISTER_SPACE);
+}
+
+/*
+ * Configure a UART port.
+ * Called when the driver adds an UART port.
+ */
+static void
+sct_uart_config_port(struct uart_port *port, int flags)
+{
+ if (flags & UART_CONFIG_TYPE && sct_uart_request_port(port) == 0)
+ port->type = PORT_SCT;
+}
+
+/* Set port type */
+static const char*
+sct_uart_type(struct uart_port *port)
+{
+ return port->type == PORT_SCT ? "SCT_UART" : NULL;
+}
+
+/* Start transmitting bytes. */
+static void
+sct_uart_start_tx(struct uart_port *port)
+{
+ while (1) {
+ sct_uart_putc(port,
port->info->xmit.buf[port->info->xmit.tail]);
+ port->info->xmit.tail = (port->info->xmit.tail + 1) &
+ (UART_XMIT_SIZE - 1);
+ port->icount.tx++;
+ if (uart_circ_empty(&port->info->xmit))
+ break;
+ }
+}
+
+/* Initialize an UART port */
+static void
+sct_uart_init_port(unsigned int base, int early)
+{
+#ifndef CONFIG_SCORE_SIM
+ unsigned short val = 0;
+
+ /* Clear error and status register */
+ writew(0, UART_ERR(base));
+ writew(0, UART_ST(base));
+
+ /* Set UART baudrate to 1152000 */
+ writew(UART_BAUDRATE, UART_BUD(base));
+
+ /* Set UART Control Register. 8-N-1 */
+ val |= UART_CR_8BITS; /* Word Length Definition=8 Bits */
+ val &= ~UART_CR_PEN; /* Disable Party Check */
+ val &= ~UART_CR_SBSEL; /* Stop-Bit Size Selection: 1 Stop Bit */
+
+ /* don't enable interrupts when init an early port */
+ if (!early) {
+ val |= UART_CR_RIE; /* Enable receive interrupt */
+ val |= UART_CR_RT; /* Enable receive timeout
interrupt */
+ }
+ val |= UART_CR_FEN; /* Enable FIFO buffer */
+ val |= UART_CR_UEN; /* Enable UART */
+ writew(val, UART_CR(base));
+#endif
+}
+
+/* Called when an application opens an UART */
+static int
+sct_uart_startup(struct uart_port *port)
+{
+ int retval = 0;
+
+ if ((retval = request_irq(port->irq, sct_uart_rxint, 0,
+ "sct_uart", (void *)port))) {
+ return retval;
+ }
+
+ sct_uart_init_port(port->mapbase, 0);
+ return retval;
+}
+
+/* Called when an application closes an UART*/
+static void
+sct_uart_shutdown(struct uart_port *port)
+{
+#ifndef CONFIG_SERIAL_SCT_CONSOLE
+ writew(0, UART_CR(port->mapbase));
+#endif
+ free_irq(port->irq, port);
+}
+
+static void
+sct_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{}
+
+static void
+sct_uart_set_termios(struct uart_port *port, struct ktermios *new,
+ struct ktermios *old)
+{}
+
+static unsigned int sct_uart_tx_empty(struct uart_port *port)
+{
+ return (readw(UART_ST(port->mapbase)) & UART_ST_TE) ? TIOCSER_TEMT
: 0;
+}
+
+static void sct_uart_stop_rx(struct uart_port *port)
+{}
+
+static struct uart_ops sct_uart_ops = {
+ .tx_empty = sct_uart_tx_empty,
+ .stop_rx = sct_uart_stop_rx,
+ .start_tx = sct_uart_start_tx,
+ .startup = sct_uart_startup,
+ .shutdown = sct_uart_shutdown,
+ .type = sct_uart_type,
+ .config_port = sct_uart_config_port,
+ .request_port = sct_uart_request_port,
+ .release_port = sct_uart_release_port,
+ .set_mctrl = sct_uart_set_mctrl,
+ .set_termios = sct_uart_set_termios,
+};
+
+#ifdef CONFIG_SERIAL_SCT_CONSOLE
+static struct console sct_uart_console;
+#endif
+static struct uart_driver sct_uart_reg = {
+ .owner = THIS_MODULE,
+ .driver_name = "sct_uart",
+ .dev_name = "ttyS",
+ .major = UART_MAJOR,
+ .minor = UART_MINOR_START,
+ .nr = UART_PORT_NR,
+#ifdef CONFIG_SERIAL_SCT_CONSOLE
+ .cons = &sct_uart_console,
+#else
+ .cons = NULL,
+#endif
+};
+
+static struct uart_port sct_uart_port[] = {
+ {
+#ifdef CONFIG_SCORE_SIM
+ .mapbase = (unsigned int) UART_BASE,
+ .irq = UART_IRQ,
+ .fifosize = UART_FIFO_SIZE,
+#else
+ .mapbase = (unsigned int) UART0_BASE,
+ .irq = UART0_IRQ,
+ .fifosize = UART0_FIFO_SIZE,
+#endif
+ .iotype = UPIO_MEM,
+ .ops = &sct_uart_ops,
+ .flags = UPF_BOOT_AUTOCONF,
+ .line = 0,
+ },
+};
+
+static int __init
+sct_uart_probe(struct platform_device *dev)
+{
+ uart_add_one_port(&sct_uart_reg, &sct_uart_port[dev->id]);
+ platform_set_drvdata(dev, &sct_uart_port[dev->id]);
+ return 0;
+}
+
+static int
+sct_uart_remove(struct platform_device *dev)
+{
+ platform_set_drvdata(dev, NULL);
+ uart_remove_one_port(&sct_uart_reg, &sct_uart_port[dev->id]);
+ return 0;
+}
+
+static int
+sct_uart_suspend(struct platform_device *dev, pm_message_t state)
+{
+ uart_suspend_port(&sct_uart_reg, &sct_uart_port[dev->id]);
+ return 0;
+}
+
+static int
+sct_uart_resume(struct platform_device *dev)
+{
+ uart_resume_port(&sct_uart_reg, &sct_uart_port[dev->id]);
+ return 0;
+}
+
+struct platform_device *sct_uart_plat_device0;
+
+static struct platform_driver sct_uart_driver = {
+ .probe = sct_uart_probe,
+ .remove = __exit_p(sct_uart_remove),
+ .suspend = sct_uart_suspend,
+ .resume = sct_uart_resume,
+ .driver = {
+ .name = "sct_uart",
+ .owner = THIS_MODULE,
+ },
+};
+
+/* Driver module initialization */
+static int __init
+sct_uart_init(void)
+{
+ int retval;
+
+ if ((retval = uart_register_driver(&sct_uart_reg)))
+ return retval;
+
+ sct_uart_plat_device0 =
platform_device_register_simple("sct_uart",
+ 0, NULL,
0);
+ if (IS_ERR(sct_uart_plat_device0)) {
+ uart_unregister_driver(&sct_uart_reg);
+ return PTR_ERR(sct_uart_plat_device0);
+ }
+
+ if ((retval = platform_driver_register(&sct_uart_driver))) {
+ platform_device_unregister(sct_uart_plat_device0);
+ uart_unregister_driver(&sct_uart_reg);
+ }
+ return 0;
+}
+
+/* Driver module exit */
+static void __exit sct_uart_exit(void)
+{
+ platform_driver_unregister(&sct_uart_driver);
+ platform_device_unregister(sct_uart_plat_device0);
+ uart_unregister_driver(&sct_uart_reg);
+}
+
+module_init(sct_uart_init);
+module_exit(sct_uart_exit);
+MODULE_LICENSE("GPL");
+
+#ifdef CONFIG_SERIAL_SCT_CONSOLE
+asmlinkage void sct_uart_out(const char *s)
+{
+#ifdef CONFIG_SCORE_SIM
+ unsigned int i;
+
+ for (i = 0; *s != '\0'; i++, s++)
+ send_char(*s);
+#else
+ unsigned int i, base = UART0_BASE;
+ unsigned short val = 0;
+
+ if (readw(UART_CR(base)) == 0) {
+ /* Clear error and status register */
+ writew(0, UART_ERR(base));
+ writew(0, UART_ST(base));
+
+ /* Set UART Control Register. 8-N-1 */
+ val |= UART_CR_8BITS; /* Word Length Definition=8 Bits
*/
+ val &= ~UART_CR_PEN; /* Disable Party Check */
+ val &= ~UART_CR_SBSEL; /* Stop-Bit Size Selection: 1 Stop
Bit */
+ val |= UART_CR_FEN; /* Enable FIFO buffer */
+ val |= UART_CR_UEN; /* Enable UART */
+ writew(val, UART_CR(base));
+ }
+
+ /* Set UART baudrate to 1152000 */
+ writew(UART_BAUDRATE, UART_BUD(base));
+
+ for (i = 0; *s != '\0'; i++, s++) {
+ /* wait until not busy */
+ while (readw(UART_ST(base)) & UART_ST_BY);
+ writeb(*s, UART_DR(base));
+
+ if (*s == '\n') {
+ while (readw(UART_ST(base)) & UART_ST_BY);
+ writeb('\r', UART_DR(base));
+ }
+ }
+#endif
+}
+
+static void
+sct_uart_console_write(struct console *con, const char *s, u_int count)
+{
+ int i;
+
+ for (i = 0; i < count; i++, s++)
+ sct_uart_putc(&sct_uart_port[con->index], *s);
+}
+
+static void __init
+sct_uart_console_get_options(struct uart_port *port, int *baud,
+ int *parity, int *bits)
+{
+ *parity = 'n';
+ *bits = 8;
+ *baud = 115200;
+}
+
+static int __init
+sct_uart_console_setup(struct console *con, char *options)
+{
+ struct uart_port *port;
+ int baud, bits, parity, flow;
+
+ if (con->index == -1 || con->index >= UART_PORT_NR)
+ con->index = 0;
+
+ port = &sct_uart_port[con->index];
+
+ if (options)
+ uart_parse_options(options, &baud, &parity, &bits, &flow);
+ else
+ sct_uart_console_get_options(port, &baud, &parity, &bits);
+
+ return uart_set_options(port, con, baud, parity, bits, flow);
+}
+
+static int __init
+sct_uart_console_early_setup(void)
+{
+ return 0;
+}
+
+
+static struct console sct_uart_console = {
+ .name = "ttyS",
+ .write = sct_uart_console_write,
+ .device = uart_console_device,
+ .setup = sct_uart_console_setup,
+ .early_setup = sct_uart_console_early_setup,
+ .flags = CON_PRINTBUFFER,
+ .index = -1,
+ .data = &sct_uart_reg,
+};
+
+static struct console sct_early_uart_console __initdata = {
+ .name = "uart",
+ .write = sct_uart_console_write,
+ .flags = CON_PRINTBUFFER | CON_BOOT,
+ .index = -1,
+};
+
+/* init an uart console during init calls*/
+static int __init
+sct_uart_console_init(void)
+{
+#ifdef CONFIG_SCORE_SIM
+ sct_uart_init_port(UART_BASE, 0);
+#else
+ sct_uart_init_port(UART0_BASE, 0);
+#endif
+ register_console(&sct_uart_console);
+ return 0;
+}
+console_initcall(sct_uart_console_init);
+
+/*
+ * setup an early uart console when user
+ * specifies "earlycon" option.
+ */
+int __init
+setup_early_sct_uart_console(char *cmdline)
+{
+ char *options;
+
+ options = strstr(cmdline, "sct_uart,");
+
+ if (!options) {
+ options = strstr(cmdline, "uart,");
+ if (!options)
+ return 0;
+ }
+
+#ifdef CONFIG_SCORE_SIM
+ sct_uart_init_port(UART_BASE, 1);
+#else
+ sct_uart_init_port(UART0_BASE, 1);
+#endif
+ register_console(&sct_early_uart_console);
+ return 0;
+}
+early_param("earlycon", setup_early_sct_uart_console);
+
+#endif /* CONFIG_SERIAL_SCT_CONSOLE */
+
diff -uprN -x linux-2.6-git.ori/Documentation/dontdiff
linux-2.6-git.ori/drivers/serial/sct_serial.h
linux-2.6-git.new/drivers/serial/sct_serial.h
--- linux-2.6-git.ori/drivers/serial/sct_serial.h 1970-01-01
08:00:00.000000000 +0800
+++ linux-2.6-git.new/drivers/serial/sct_serial.h 2009-04-07
21:38:32.000000000 +0800
@@ -0,0 +1,138 @@
+/*
+ * File: linux/drivers/serial/sct_serial.h
+ *
+ * Based on: linux/drivers/serial/8250.h
+ * Author: Chang Yu-ming
+ *
+ * Created: Nov 29, 2008
+ * Copyright: (C) Sunplus Core Technology Co., Ltd.
+ * Description: Driver for SunplusCT Serial ports.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _SCT_SERIAL_H_
+#define _SCT_SERIAL_H_
+
+#define UART_MAJOR 4
+#define UART_MINOR_START 64
+#define UART_PORT_NR 1
+
+/* define UART IRQ */
+#define UART0_IRQ 16
+#define UART_IRQ 16
+
+/* define UART I/O base address */
+#if defined(CONFIG_MACH_SPG300) || defined(CONFIG_MACH_SPCT6600)
+#define UART0_BASE 0x96070000
+#define UART_REGISTER_SPACE 0x24
+#define UART0_FIFO_SIZE 8
+#elif defined(CONFIG_SCORE_SIM)
+#define UART_BASE 0x88250000
+#define UART_REGISTER_SPACE 0x18
+#define UART_FIFO_SIZE 1
+#endif
+
+/* define UART baudrate parameter */
+#if defined(CONFIG_MACH_IAB050) || defined(CONFIG_SCORE_SPG300)
+#define UART_BAUDRATE 233
+#elif defined(CONFIG_MACH_SCT6600_TWN)
+#define UART_BAUDRATE 70
+#elif defined(CONFIG_MACH_SPG300) || defined(CONFIG_MACH_SPCT6600)
+#define UART_BAUDRATE 0x39 /* 27Mhz */
+#elif defined(CONFIG_MACH_SCT6600_SD)
+#define UART_BAUDRATE 0xe9
+#elif defined(CONFIG_MACH_SCT6600_USB)
+#define UART_BAUDRATE 0x33
+#else
+#define UART_BAUDRATE 0 /* Don't care */
+#endif
+
+/* define UART register address */
+#ifdef CONFIG_SCORE_SIM
+#define UART_RBR (UART_BASE+0x00) /* Rx buffer */
+#define UART_THR (UART_BASE+0x00) /* Tx buffer */
+#define UART_IER (UART_BASE+0x04) /* interrupt
enable */
+#define UART_LSR (UART_BASE+0x14) /* line status */
+#else
+#define UART_DR(_base) (_base+0x00) /* Rx\Tx buffer */
+#define UART_ERR(_base) (_base+0x04) /* Rx\Tx
Error Flag Register */
+#define UART_CR(_base) (_base+0x08) /* Conrol register
*/
+#define UART_BUD(_base) (_base+0x0C) /* Baud
Rate Setup Register */
+#define UART_ST(_base) (_base+0x10) /* Status Register
*/
+#define UART_IRDABUD(_base) (_base+0x14) /* IRDA Baud Rate
Setup Register */
+#define UART_IRDALP(_base) (_base+0x18) /* IRDA Low Power
Setup Register */
+#define UART_IRDACR(_base) (_base+0x1C) /* IRDA Control
Register */
+#define UART_TWTR(_base) (_base+0x20) /* Transmitter
Waiting time Register */
+#endif
+
+
+/*
+ * Bit definition of Rx/Tx error flag register
+ * rUARTEFR (_base+0x04)
+ */
+#define UART_ERR_RXD (1 << 15) /* UART RXD signal, 0: in
process of receiving data
+ 1: receive data
have completed */
+#define UART_ERR_OE (1 << 3) /* overrun error */
+#define UART_ERR_BE (1 << 2) /* break error */
+#define UART_ERR_PE (1 << 1) /* parity error */
+#define UART_ERR_FE 1 /* frame error */
+
+/*
+ * Bit definition of control register:
+ * rUARTCR (_base+0x04)
+ */
+#define UART_CR_RIE (1 << 15) /* receive interrupt
enable */
+#define UART_CR_TIE (1 << 14) /* transmit interrupt
enable */
+#define UART_CR_RT (1 << 13) /* receive timeout
interrupt enable */
+#define UART_CR_UEN (1 << 12) /* UART enable */
+#define UART_CR_MSIE (1 << 11) /* modem status interrupt
enable */
+#define UART_CR_SLT (1 << 10) /* self loop test */
+#define UART_CR_MEN (1 << 9) /* modem enable */
+#define UART_CR_WKUEN (1 << 8) /* wake up enable */
+#define UART_CR_8BITS (0x3 << 5)
+#define UART_CR_7BITS (0x2 << 5)
+#define UART_CR_6BITS (0x1 << 5)
+#define UART_CR_5BITS 0x0
+#define UART_CR_FEN (1 << 4) /* FIFO buffer enable */
+#define UART_CR_SBSEL (1 << 3) /* stop bit size
selection, 0: one stop bit, 1: two stop bits */
+#define UART_CR_PSEL (1 << 2) /* parity selection, 0:
odd parity, 1: even parity */
+#define UART_CR_PEN (1 << 1) /* parity enable */
+#define UART_CR_SB 1 /* send break */
+
+/*
+ * Bit definition of status register
+ * rUARTST (_base+0x10)
+ */
+#define UART_ST_RI (1 << 15) /* receive interrupt flag
*/
+#define UART_ST_TI (1 << 14) /* transmit interrupt flag
*/
+#define UART_ST_RT (1 << 13) /* receive timeout
interrupt flag */
+#define UART_ST_MIT (1 << 12) /* modem status interrupt
flag */
+#define UART_ST_MRI (1 << 10) /* complement of
nUARTRI(Ring Indicator) modem status input */
+#define UART_ST_RTS (1 << 9) /* modem output (Request
to Send) */
+#define UART_ST_DTR (1 << 8) /* modem output (Data
Terminal Ready) */
+#define UART_ST_TE (1 << 7) /* transmit FIFO empty
flag */
+#define UART_ST_RF (1 << 6) /* receive FIFO full flag
*/
+#define UART_ST_TF (1 << 5) /* transmit FIFO full flag
*/
+#define UART_ST_RE (1 << 4) /* receive FIFO empty flag
*/
+#define UART_ST_BY (1 << 3) /* busy */
+#define UART_ST_MDCD (1 << 2) /* complement of
nUARTDCD(Data Carrier Detect) modem status input */
+#define UART_ST_MDSR (1 << 1) /* complement of
nUARTDSR(Data Set Ready) modem status input */
+#define UART_ST_MCTS 1 /* complement of
nUARTCTS(Clear to Send) modem status input */
+
+#define PORT_SCT 86
+#endif /* _SCT_SERIAL_H_ */
+
Binary files linux-2.6-git.ori/.git/index and linux-2.6-git.new/.git/index
differ
diff -uprN -x linux-2.6-git.ori/Documentation/dontdiff
linux-2.6-git.ori/MAINTAINERS linux-2.6-git.new/MAINTAINERS
--- linux-2.6-git.ori/MAINTAINERS 2009-03-23 11:24:36.000000000
+0800
+++ linux-2.6-git.new/MAINTAINERS 2009-03-23 17:32:21.000000000
+0800
@@ -3772,6 +3772,14 @@ M: rml@...h9.net
L: linux-kernel@...r.kernel.org
S: Maintained
+SCORE ARCHITECTURE
+P: Chen Liqin
+M: liqin.chen@...plusct.com
+P: Lennox Wu
+M: lennox.wu@...plusct.com
+W: http://www.sunplusct.com
+S: Supported
+
SCSI CDROM DRIVER
P: Jens Axboe
M: axboe@...nel.dk
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists