lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: mach-titan: Kill off unused PIO port mangling.

Browse Source 
Nothing is using this, kill it off. Fixing up access sizes can be done
with trapped I/O for anyone wanting to make use of this for devices that
need it, everything else is already pure MMIO.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-01-28 15:08:21 +09:00
parent 7013109f52
commit f655f5e956
5 changed files with 3 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sh/Makefile
View File

@@ -149,7 +149,6 @@ machdir-$(CONFIG_SH_X3PROTO) += mach-x3proto
machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp
machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev
machdir-$(CONFIG_SH_LANDISK) += mach-landisk machdir-$(CONFIG_SH_LANDISK) += mach-landisk
machdir-$(CONFIG_SH_TITAN) += mach-titan
machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
machdir-$(CONFIG_SH_CAYMAN) += mach-cayman machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
machdir-$(CONFIG_SH_RSK) += mach-rsk machdir-$(CONFIG_SH_RSK) += mach-rsk

1
arch/sh/boards/Makefile
View File

@@ -8,3 +8,4 @@ obj-$(CONFIG_SH_SHMIN) += board-shmin.o
obj-$(CONFIG_SH_EDOSK7760) += board-edosk7760.o obj-$(CONFIG_SH_EDOSK7760) += board-edosk7760.o
obj-$(CONFIG_SH_ESPT) += board-espt.o obj-$(CONFIG_SH_ESPT) += board-espt.o
obj-$(CONFIG_SH_POLARIS) += board-polaris.o obj-$(CONFIG_SH_POLARIS) += board-polaris.o
obj-$(CONFIG_SH_TITAN) += board-titan.o

24
arch/sh/boards/mach-titan/setup.c → arch/sh/boards/board-titan.c
View File

@@ -19,26 +19,6 @@ static void __init init_titan_irq(void)
} }
static struct sh_machine_vector mv_titan __initmv = { static struct sh_machine_vector mv_titan __initmv = {
.mv_name = "Titan", .mv_name = "Titan",
.mv_init_irq = init_titan_irq,
.mv_inb = titan_inb,
.mv_inw = titan_inw,
.mv_inl = titan_inl,
.mv_outb = titan_outb,
.mv_outw = titan_outw,
.mv_outl = titan_outl,
.mv_inb_p = titan_inb_p,
.mv_inw_p = titan_inw,
.mv_inl_p = titan_inl,
.mv_outb_p = titan_outb_p,
.mv_outw_p = titan_outw,
.mv_outl_p = titan_outl,
.mv_insl = titan_insl,
.mv_outsl = titan_outsl,
.mv_ioport_map = titan_ioport_map,
.mv_init_irq = init_titan_irq,
}; };

5
arch/sh/boards/mach-titan/Makefile
View File

@@ -1,5 +0,0 @@
#
# Makefile for the Nimble Microsystems TITAN specific parts of the kernel
#
obj-y := setup.o io.o

108
arch/sh/boards/mach-titan/io.c
View File

@@ -1,108 +0,0 @@
/*
* I/O routines for Titan
*/
#include <linux/pci.h>
#include <asm/machvec.h>
#include <asm/addrspace.h>
#include <mach/titan.h>
#include <asm/io.h>
static inline unsigned int port2adr(unsigned int port)
{
maybebadio((unsigned long)port);
return port;
}
u8 titan_inb(unsigned long port)
{
if (PXSEG(port))
return __raw_readb(port);
return __raw_readw(port2adr(port)) & 0xff;
}
u8 titan_inb_p(unsigned long port)
{
u8 v;
if (PXSEG(port))
v = __raw_readb(port);
else
v = __raw_readw(port2adr(port)) & 0xff;
ctrl_delay();
return v;
}
u16 titan_inw(unsigned long port)
{
if (PXSEG(port))
return __raw_readw(port);
else if (port >= 0x2000)
return __raw_readw(port2adr(port));
else
maybebadio(port);
return 0;
}
u32 titan_inl(unsigned long port)
{
if (PXSEG(port))
return __raw_readl(port);
else if (port >= 0x2000)
return __raw_readw(port2adr(port));
else
maybebadio(port);
return 0;
}
void titan_outb(u8 value, unsigned long port)
{
if (PXSEG(port))
__raw_writeb(value, port);
else
__raw_writew(value, port2adr(port));
}
void titan_outb_p(u8 value, unsigned long port)
{
if (PXSEG(port))
__raw_writeb(value, port);
else
__raw_writew(value, port2adr(port));
ctrl_delay();
}
void titan_outw(u16 value, unsigned long port)
{
if (PXSEG(port))
__raw_writew(value, port);
else if (port >= 0x2000)
__raw_writew(value, port2adr(port));
else
maybebadio(port);
}
void titan_outl(u32 value, unsigned long port)
{
if (PXSEG(port))
__raw_writel(value, port);
else
maybebadio(port);
}
void titan_insl(unsigned long port, void *dst, unsigned long count)
{
maybebadio(port);
}
void titan_outsl(unsigned long port, const void *src, unsigned long count)
{
maybebadio(port);
}
void __iomem *titan_ioport_map(unsigned long port, unsigned int size)
{
if (PXSEG(port))
return (void __iomem *)port;
return (void __iomem *)port2adr(port);
}