diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-28 01:08:21 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-28 01:08:21 -0500 |
commit | f655f5e956eaf4fcda983f3b3d37c76371556c27 (patch) | |
tree | f1fd617afe0856a303b5e9ca470358c97cc33c92 /arch/sh/boards | |
parent | 7013109f52ff38ad9ea38952cedc144c8e8b9636 (diff) |
sh: mach-titan: Kill off unused PIO port mangling.
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>
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/Makefile | 1 | ||||
-rw-r--r-- | arch/sh/boards/board-titan.c (renamed from arch/sh/boards/mach-titan/setup.c) | 24 | ||||
-rw-r--r-- | arch/sh/boards/mach-titan/Makefile | 5 | ||||
-rw-r--r-- | arch/sh/boards/mach-titan/io.c | 108 |
4 files changed, 3 insertions, 135 deletions
diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile index ce0f26381784..4f90f9b7a922 100644 --- a/arch/sh/boards/Makefile +++ b/arch/sh/boards/Makefile | |||
@@ -8,3 +8,4 @@ obj-$(CONFIG_SH_SHMIN) += board-shmin.o | |||
8 | obj-$(CONFIG_SH_EDOSK7760) += board-edosk7760.o | 8 | obj-$(CONFIG_SH_EDOSK7760) += board-edosk7760.o |
9 | obj-$(CONFIG_SH_ESPT) += board-espt.o | 9 | obj-$(CONFIG_SH_ESPT) += board-espt.o |
10 | obj-$(CONFIG_SH_POLARIS) += board-polaris.o | 10 | obj-$(CONFIG_SH_POLARIS) += board-polaris.o |
11 | obj-$(CONFIG_SH_TITAN) += board-titan.o | ||
diff --git a/arch/sh/boards/mach-titan/setup.c b/arch/sh/boards/board-titan.c index 81e7e0f03863..94c36c7bc0b3 100644 --- a/arch/sh/boards/mach-titan/setup.c +++ b/arch/sh/boards/board-titan.c | |||
@@ -19,26 +19,6 @@ static void __init init_titan_irq(void) | |||
19 | } | 19 | } |
20 | 20 | ||
21 | static struct sh_machine_vector mv_titan __initmv = { | 21 | static struct sh_machine_vector mv_titan __initmv = { |
22 | .mv_name = "Titan", | 22 | .mv_name = "Titan", |
23 | 23 | .mv_init_irq = init_titan_irq, | |
24 | .mv_inb = titan_inb, | ||
25 | .mv_inw = titan_inw, | ||
26 | .mv_inl = titan_inl, | ||
27 | .mv_outb = titan_outb, | ||
28 | .mv_outw = titan_outw, | ||
29 | .mv_outl = titan_outl, | ||
30 | |||
31 | .mv_inb_p = titan_inb_p, | ||
32 | .mv_inw_p = titan_inw, | ||
33 | .mv_inl_p = titan_inl, | ||
34 | .mv_outb_p = titan_outb_p, | ||
35 | .mv_outw_p = titan_outw, | ||
36 | .mv_outl_p = titan_outl, | ||
37 | |||
38 | .mv_insl = titan_insl, | ||
39 | .mv_outsl = titan_outsl, | ||
40 | |||
41 | .mv_ioport_map = titan_ioport_map, | ||
42 | |||
43 | .mv_init_irq = init_titan_irq, | ||
44 | }; | 24 | }; |
diff --git a/arch/sh/boards/mach-titan/Makefile b/arch/sh/boards/mach-titan/Makefile deleted file mode 100644 index 08d753700062..000000000000 --- a/arch/sh/boards/mach-titan/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the Nimble Microsystems TITAN specific parts of the kernel | ||
3 | # | ||
4 | |||
5 | obj-y := setup.o io.o | ||
diff --git a/arch/sh/boards/mach-titan/io.c b/arch/sh/boards/mach-titan/io.c deleted file mode 100644 index 29754c5091f0..000000000000 --- a/arch/sh/boards/mach-titan/io.c +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | /* | ||
2 | * I/O routines for Titan | ||
3 | */ | ||
4 | #include <linux/pci.h> | ||
5 | #include <asm/machvec.h> | ||
6 | #include <asm/addrspace.h> | ||
7 | #include <mach/titan.h> | ||
8 | #include <asm/io.h> | ||
9 | |||
10 | static inline unsigned int port2adr(unsigned int port) | ||
11 | { | ||
12 | maybebadio((unsigned long)port); | ||
13 | return port; | ||
14 | } | ||
15 | |||
16 | u8 titan_inb(unsigned long port) | ||
17 | { | ||
18 | if (PXSEG(port)) | ||
19 | return __raw_readb(port); | ||
20 | return __raw_readw(port2adr(port)) & 0xff; | ||
21 | } | ||
22 | |||
23 | u8 titan_inb_p(unsigned long port) | ||
24 | { | ||
25 | u8 v; | ||
26 | |||
27 | if (PXSEG(port)) | ||
28 | v = __raw_readb(port); | ||
29 | else | ||
30 | v = __raw_readw(port2adr(port)) & 0xff; | ||
31 | ctrl_delay(); | ||
32 | return v; | ||
33 | } | ||
34 | |||
35 | u16 titan_inw(unsigned long port) | ||
36 | { | ||
37 | if (PXSEG(port)) | ||
38 | return __raw_readw(port); | ||
39 | else if (port >= 0x2000) | ||
40 | return __raw_readw(port2adr(port)); | ||
41 | else | ||
42 | maybebadio(port); | ||
43 | return 0; | ||
44 | } | ||
45 | |||
46 | u32 titan_inl(unsigned long port) | ||
47 | { | ||
48 | if (PXSEG(port)) | ||
49 | return __raw_readl(port); | ||
50 | else if (port >= 0x2000) | ||
51 | return __raw_readw(port2adr(port)); | ||
52 | else | ||
53 | maybebadio(port); | ||
54 | return 0; | ||
55 | } | ||
56 | |||
57 | void titan_outb(u8 value, unsigned long port) | ||
58 | { | ||
59 | if (PXSEG(port)) | ||
60 | __raw_writeb(value, port); | ||
61 | else | ||
62 | __raw_writew(value, port2adr(port)); | ||
63 | } | ||
64 | |||
65 | void titan_outb_p(u8 value, unsigned long port) | ||
66 | { | ||
67 | if (PXSEG(port)) | ||
68 | __raw_writeb(value, port); | ||
69 | else | ||
70 | __raw_writew(value, port2adr(port)); | ||
71 | ctrl_delay(); | ||
72 | } | ||
73 | |||
74 | void titan_outw(u16 value, unsigned long port) | ||
75 | { | ||
76 | if (PXSEG(port)) | ||
77 | __raw_writew(value, port); | ||
78 | else if (port >= 0x2000) | ||
79 | __raw_writew(value, port2adr(port)); | ||
80 | else | ||
81 | maybebadio(port); | ||
82 | } | ||
83 | |||
84 | void titan_outl(u32 value, unsigned long port) | ||
85 | { | ||
86 | if (PXSEG(port)) | ||
87 | __raw_writel(value, port); | ||
88 | else | ||
89 | maybebadio(port); | ||
90 | } | ||
91 | |||
92 | void titan_insl(unsigned long port, void *dst, unsigned long count) | ||
93 | { | ||
94 | maybebadio(port); | ||
95 | } | ||
96 | |||
97 | void titan_outsl(unsigned long port, const void *src, unsigned long count) | ||
98 | { | ||
99 | maybebadio(port); | ||
100 | } | ||
101 | |||
102 | void __iomem *titan_ioport_map(unsigned long port, unsigned int size) | ||
103 | { | ||
104 | if (PXSEG(port)) | ||
105 | return (void __iomem *)port; | ||
106 | |||
107 | return (void __iomem *)port2adr(port); | ||
108 | } | ||