diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-07 05:10:27 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-07 05:10:27 -0400 |
commit | 0fb849b9d743a20056f2418cd955e5c650658663 (patch) | |
tree | dd2d44103536ae83f8db483a8657bdcc36ad5c14 /drivers/serial/sh-sci.c | |
parent | ae318a148e4d255dfbc87d963fdd6031c2af9c46 (diff) |
sh: Integrate the SH-5 onchip_remap() more coherently.
Presently this is special-cased for early initialization. While there are
situations where these static early initializations are still necessary,
with minor changes it is possible to use this for the regular ioremap
implementation as well. This allows us to kill off the special-casing for
the remap completely and to start tidying up all of the SH-5
special-casing in drivers.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
-rw-r--r-- | drivers/serial/sh-sci.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index dbf5357a77b3..728d6a062bf6 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -985,13 +985,7 @@ static void sci_config_port(struct uart_port *port, int flags) | |||
985 | port->type = s->type; | 985 | port->type = s->type; |
986 | 986 | ||
987 | if (port->flags & UPF_IOREMAP && !port->membase) { | 987 | if (port->flags & UPF_IOREMAP && !port->membase) { |
988 | #if defined(CONFIG_SUPERH64) | ||
989 | port->mapbase = onchip_remap(SCIF_ADDR_SH5, 1024, "SCIF"); | ||
990 | port->membase = (void __iomem *)port->mapbase; | ||
991 | #else | ||
992 | port->membase = ioremap_nocache(port->mapbase, 0x40); | 988 | port->membase = ioremap_nocache(port->mapbase, 0x40); |
993 | #endif | ||
994 | |||
995 | dev_err(port->dev, "can't remap port#%d\n", port->line); | 989 | dev_err(port->dev, "can't remap port#%d\n", port->line); |
996 | } | 990 | } |
997 | } | 991 | } |