summaryrefslogtreecommitdiff
path: root/target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-07-01 18:42:49 +0000
committerJonas Gorski <jogo@openwrt.org>2013-07-01 18:42:49 +0000
commit87c0c2d81d2d358cd2a2a8b71eaaf2243ea8767a (patch)
treea21cf915d6de074b53427e032f5408956b63aa72 /target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
parent923a851ccfad8232ab3d0a4df588d1c6d0329f6a (diff)
downloadmtk-20170518-87c0c2d81d2d358cd2a2a8b71eaaf2243ea8767a.zip
mtk-20170518-87c0c2d81d2d358cd2a2a8b71eaaf2243ea8767a.tar.gz
mtk-20170518-87c0c2d81d2d358cd2a2a8b71eaaf2243ea8767a.tar.bz2
ixp4xx: add support for linux 3.10
Run tested on a NSLU2. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37124
Diffstat (limited to 'target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch')
-rw-r--r--target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch121
1 files changed, 121 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
new file mode 100644
index 0000000..d24eb37
--- /dev/null
+++ b/target/linux/ixp4xx/patches-3.10/160-delayed_uart_io.patch
@@ -0,0 +1,121 @@
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
+@@ -410,6 +410,20 @@ static void mem_serial_out(struct uart_p
+ writeb(value, p->membase + offset);
+ }
+
++static unsigned int memdelay_serial_in(struct uart_port *p, int offset)
++{
++ struct uart_8250_port *up = (struct uart_8250_port *)p;
++ udelay(up->port.rw_delay);
++ return mem_serial_in(p, offset);
++}
++
++static void memdelay_serial_out(struct uart_port *p, int offset, int value)
++{
++ struct uart_8250_port *up = (struct uart_8250_port *)p;
++ udelay(up->port.rw_delay);
++ mem_serial_out(p, offset, value);
++}
++
+ static void mem32_serial_out(struct uart_port *p, int offset, int value)
+ {
+ offset = offset << p->regshift;
+@@ -461,6 +475,11 @@ static void set_io_from_upio(struct uart
+ p->serial_out = mem32_serial_out;
+ break;
+
++ case UPIO_MEM_DELAY:
++ p->serial_in = memdelay_serial_in;
++ p->serial_out = memdelay_serial_out;
++ break;
++
+ #if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_SERIAL_8250_RT288X)
+ case UPIO_AU:
+ p->serial_in = au_serial_in;
+@@ -486,6 +505,7 @@ serial_port_out_sync(struct uart_port *p
+ switch (p->iotype) {
+ case UPIO_MEM:
+ case UPIO_MEM32:
++ case UPIO_MEM_DELAY:
+ case UPIO_AU:
+ p->serial_out(p, offset, value);
+ p->serial_in(p, UART_LCR); /* safe, no side-effects */
+@@ -2520,6 +2540,7 @@ static int serial8250_request_std_resour
+ case UPIO_TSI:
+ case UPIO_MEM32:
+ case UPIO_MEM:
++ case UPIO_MEM_DELAY:
+ if (!port->mapbase)
+ break;
+
+@@ -2556,6 +2577,7 @@ static void serial8250_release_std_resou
+ case UPIO_TSI:
+ case UPIO_MEM32:
+ case UPIO_MEM:
++ case UPIO_MEM_DELAY:
+ if (!port->mapbase)
+ break;
+
+@@ -3091,6 +3113,7 @@ static int serial8250_probe(struct platf
+ uart.port.set_termios = p->set_termios;
+ uart.port.pm = p->pm;
+ uart.port.dev = &dev->dev;
++ uart.port.rw_delay = p->rw_delay;
+ uart.port.irqflags |= irqflag;
+ ret = serial8250_register_8250_port(&uart);
+ if (ret < 0) {
+@@ -3242,6 +3265,7 @@ int serial8250_register_8250_port(struct
+ uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF;
+ uart->bugs = up->bugs;
+ uart->port.mapbase = up->port.mapbase;
++ uart->port.rw_delay = up->port.rw_delay;
+ uart->port.private_data = up->port.private_data;
+ uart->port.fifosize = up->port.fifosize;
+ uart->tx_loadsz = up->tx_loadsz;
+--- a/drivers/tty/serial/serial_core.c
++++ b/drivers/tty/serial/serial_core.c
+@@ -2089,6 +2089,7 @@ uart_report_port(struct uart_driver *drv
+ snprintf(address, sizeof(address),
+ "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
+ break;
++ case UPIO_MEM_DELAY:
+ case UPIO_MEM:
+ case UPIO_MEM32:
+ case UPIO_AU:
+@@ -2710,6 +2711,7 @@ int uart_match_port(struct uart_port *po
+ case UPIO_HUB6:
+ return (port1->iobase == port2->iobase) &&
+ (port1->hub6 == port2->hub6);
++ case UPIO_MEM_DELAY:
+ case UPIO_MEM:
+ case UPIO_MEM32:
+ case UPIO_AU:
+--- a/include/linux/serial_8250.h
++++ b/include/linux/serial_8250.h
+@@ -27,6 +27,7 @@ struct plat_serial8250_port {
+ void *private_data;
+ unsigned char regshift; /* register shift */
+ unsigned char iotype; /* UPIO_* */
++ unsigned int rw_delay; /* udelay for slower busses IXP4XX Expansion Bus */
+ unsigned char hub6;
+ upf_t flags; /* UPF_* flags */
+ unsigned int type; /* If UPF_FIXED_TYPE */
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
+@@ -135,6 +135,7 @@ struct uart_port {
+ #define UPIO_MEM32 (3)
+ #define UPIO_AU (4) /* Au1x00 and RT288x type IO */
+ #define UPIO_TSI (5) /* Tsi108/109 type IO */
++#define UPIO_MEM_DELAY (6)
+
+ unsigned int read_status_mask; /* driver specific */
+ unsigned int ignore_status_mask; /* driver specific */
+@@ -183,6 +184,7 @@ struct uart_port {
+
+ unsigned int mctrl; /* current modem ctrl settings */
+ unsigned int timeout; /* character-based timeout */
++ unsigned int rw_delay; /* udelay for slow busses, IXP4XX Expansion Bus */
+ unsigned int type; /* port type */
+ const struct uart_ops *ops;
+ unsigned int custom_divisor;