diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 08:41:24 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 08:41:24 +0200 |
| commit | 373e68b5472d421cbd2703e7a77caf053f78c005 (patch) | |
| tree | 6fed51fdf1b89f80a1ec9ea4aab285c1af649945 /arch/sh/boards/sh03 | |
| parent | sh: Fix split ptlock for user mappings in __do_page_fault(). (diff) | |
| download | linux-373e68b5472d421cbd2703e7a77caf053f78c005.tar.xz linux-373e68b5472d421cbd2703e7a77caf053f78c005.zip | |
sh: Board updates for I/O routine rework.
This updates the various boards for some of the recent I/O routine
updates.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/sh03')
| -rw-r--r-- | arch/sh/boards/sh03/setup.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index 60290f8f289c..dab742a00c6f 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c @@ -7,22 +7,19 @@ #include <linux/init.h> #include <linux/irq.h> -#include <linux/hdreg.h> -#include <linux/ide.h> #include <asm/io.h> +#include <asm/rtc.h> #include <asm/sh03/io.h> #include <asm/sh03/sh03.h> #include <asm/addrspace.h> #include "../../drivers/pci/pci-sh7751.h" -extern void (*board_time_init)(void); - const char *get_system_type(void) { return "Interface CTP/PCI-SH03)"; } -void init_sh03_IRQ(void) +static void init_sh03_IRQ(void) { ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR); @@ -34,24 +31,20 @@ void init_sh03_IRQ(void) extern void *cf_io_base; -unsigned long sh03_isa_port2addr(unsigned long port) +static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size) { if (PXSEG(port)) - return port; + return (void __iomem *)port; /* CompactFlash (IDE) */ - if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6)) { - return (unsigned long)cf_io_base + port; - } - return port + SH7751_PCI_IO_BASE; -} + if (((port >= 0x1f0) && (port <= 0x1f7)) || (port == 0x3f6)) + return (void __iomem *)((unsigned long)cf_io_base + port); -/* - * The Machine Vector - */ + return (void __iomem *)(port + SH7751_PCI_IO_BASE); +} struct sh_machine_vector mv_sh03 __initmv = { .mv_nr_irqs = 48, - .mv_isa_port2addr = sh03_isa_port2addr, + .mv_ioport_map = sh03_ioport_map, .mv_init_irq = init_sh03_IRQ, #ifdef CONFIG_HEARTBEAT |