summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-09-18 15:41:39 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-09-21 11:57:54 +0900
commit8f3dc1371efb5fd5f1dc02b2a01da589f2d220a0 (patch)
treea66783a0e58d2233788546183beb57e1a15f0798
parentc3fae6d163f4647e9390eac3f2a1201e91cd6669 (diff)
downloadlinux-3.10-8f3dc1371efb5fd5f1dc02b2a01da589f2d220a0.tar.gz
linux-3.10-8f3dc1371efb5fd5f1dc02b2a01da589f2d220a0.tar.bz2
linux-3.10-8f3dc1371efb5fd5f1dc02b2a01da589f2d220a0.zip
sh: se7206: Handle non-SuperIO I/O ports.
This fixes up the port calculation logic for non-SuperIO accesses, before these were always matching the MRSHPC base, now just make sure the original port is handed back if it's not in the I/O port range. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/boards/se/7206/io.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/boards/se/7206/io.c b/arch/sh/boards/se/7206/io.c
index eb30dc2df96..1308e618e04 100644
--- a/arch/sh/boards/se/7206/io.c
+++ b/arch/sh/boards/se/7206/io.c
@@ -30,6 +30,8 @@ port2adr(unsigned int port)
return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
else if (port >= 0x300 && port < 0x310)
return (volatile __u16 *) (PA_SMSC + (port - 0x300));
+
+ return (volatile __u16 *)port;
}
unsigned char se7206_inb(unsigned long port)