Re: Merging Skylark's IOC3 patch

[Martin Michlmayr <tbm@cyrius.com>]

* Martin Michlmayr <tbm@cyrius.com> [2006-02-19 22:01]:
> 21:59 < Skylark> The 6/6 isn't exactly right
> 22:00 < Skylark> It should be a part of the 5/6, really (making it 5/5)
> 22:00 < Skylark> And dependent on 4/6

Updated patch, merged 5/6 and 6/6 into 5/5.


From: Stanislaw Skowronek <skylark@linux-mips.org>

[PATCH 5/5] [MIPS] Switch IP27 to the new IOC3 UART driver

Switch IP27 to the new IOC3 UART driver.  Also now that IOC3 swapping
has been moved to where it belongs, namely into the serial layer, make
IP27 swizzle the 8-bit accesses in the correct way.

Signed-off-by: Stanislaw Skowronek <skylark@linux-mips.org>
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

---

 arch/mips/sgi-ip27/ip27-console.c        |    2 +-
 include/asm-mips/mach-ip27/mangle-port.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-mips/mach-ip27/mangle-port.h b/include/asm-mips/mach-ip27/mangle-port.h
index f76c448..83e12e3 100644
--- a/include/asm-mips/mach-ip27/mangle-port.h
+++ b/include/asm-mips/mach-ip27/mangle-port.h
@@ -8,7 +8,7 @@
 #ifndef __ASM_MACH_IP27_MANGLE_PORT_H
 #define __ASM_MACH_IP27_MANGLE_PORT_H
 
-#define __swizzle_addr_b(port)	(port)
+#define __swizzle_addr_b(port)	((port) ^ 3)
 #define __swizzle_addr_w(port)	((port) ^ 2)
 #define __swizzle_addr_l(port)	(port)
 #define __swizzle_addr_q(port)	(port)
diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c
index 3e1ac29..a973610 100644
--- a/arch/mips/sgi-ip27/ip27-console.c
+++ b/arch/mips/sgi-ip27/ip27-console.c
@@ -64,7 +64,7 @@ static void inline ioc3_console_probe(vo
 	up.irq		= 0;
 	up.uartclk	= IOC3_CLK;
 	up.regshift	= 0;
-	up.iotype	= UPIO_MEM;
+	up.iotype	= UPIO_IOC3;
 	up.flags	= IOC3_FLAGS;
 	up.line		= 0;
 


-- 
Martin Michlmayr
http://www.cyrius.com/