Skip to content

Commit

Permalink
sh: mach-sh03: Use __set_io_port_base(), kill off special ioport_map().
Browse files Browse the repository at this point in the history
This also fixes up a long-standing bug for this platform where the PIO
base was set to a register offset, rather than the actual PIO offset
itself.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Dec 22, 2008
1 parent 8db806e commit 43eeb0f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
9 changes: 0 additions & 9 deletions arch/sh/boards/mach-sh03/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ static void __init init_sh03_IRQ(void)
plat_irq_setup_pins(IRQ_MODE_IRQ);
}

static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size)
{
if (PXSEG(port))
return (void __iomem *)port;

return (void __iomem *)(port + PCI_IO_BASE);
}

/* arch/sh/boards/sh03/rtc.c */
void sh03_time_init(void);

Expand Down Expand Up @@ -99,6 +91,5 @@ static struct sh_machine_vector mv_sh03 __initmv = {
.mv_name = "Interface (CTP/PCI-SH03)",
.mv_setup = sh03_setup,
.mv_nr_irqs = 48,
.mv_ioport_map = sh03_ioport_map,
.mv_init_irq = init_sh03_IRQ,
};
3 changes: 2 additions & 1 deletion arch/sh/drivers/pci/ops-sh03.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
*/
int __init pcibios_init_platform(void)
{
return 1;
__set_io_port_base(SH7751_PCI_IO_BASE);
return 1;
}

static struct resource sh7751_io_resource = {
Expand Down

0 comments on commit 43eeb0f

Please sign in to comment.