changeset 1604:475a71424fdb

Rip out yet more sh4 serial fiddling with port 0x18 that qemu's allergic to.
author Rob Landley <rob@landley.net>
date Sat, 29 Jun 2013 04:30:02 -0500
parents 84bd3248fad8
children 085c2b22ff06
files sources/patches/linux-fixsh4-2.patch
diffstat 1 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/sources/patches/linux-fixsh4-2.patch	Sun Jun 23 18:07:31 2013 -0500
+++ b/sources/patches/linux-fixsh4-2.patch	Sat Jun 29 04:30:02 2013 -0500
@@ -4,15 +4,27 @@
 mailing list about that, but this works with existing qemu releases.
 
 diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 1bd9163..fa043f1 100644
+index 1564186..e22eaf0 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -1879,7 +1879,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1803,6 +1803,8 @@ static void sci_reset(struct uart_port *port)
+ 	struct plat_sci_reg *reg;
+ 	unsigned int status;
+ 
++return;
++
+ 	do {
+ 		status = serial_port_in(port, SCxSR);
+ 	} while (!(status & SCxSR_TEND(port)));
+@@ -1868,9 +1870,9 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
  
  	sci_init_pins(port, termios->c_cflag);
  
 -	reg = sci_getreg(port, SCFCR);
 +	reg = sci_getreg(port, 0x30);
  	if (reg->size) {
- 		unsigned short ctrl = serial_port_in(port, SCFCR);
+-		unsigned short ctrl = serial_port_in(port, SCFCR);
++		unsigned short ctrl = 0; //serial_port_in(port, SCFCR);
  
+ 		if (s->cfg->capabilities & SCIx_HAVE_RTSCTS) {
+ 			if (termios->c_cflag & CRTSCTS)