diff options
| -rw-r--r-- | arch/sh/boards/mach-se/7751/Makefile | 2 | ||||
| -rw-r--r-- | arch/sh/boards/mach-se/7751/io.c | 119 | ||||
| -rw-r--r-- | arch/sh/boards/mach-se/7751/setup.c | 18 |
3 files changed, 1 insertions, 138 deletions
diff --git a/arch/sh/boards/mach-se/7751/Makefile b/arch/sh/boards/mach-se/7751/Makefile index e6f4341bfe6e..a338fd9d5039 100644 --- a/arch/sh/boards/mach-se/7751/Makefile +++ b/arch/sh/boards/mach-se/7751/Makefile | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | # Makefile for the 7751 SolutionEngine specific parts of the kernel | 2 | # Makefile for the 7751 SolutionEngine specific parts of the kernel |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := setup.o io.o irq.o | 5 | obj-y := setup.o irq.o |
diff --git a/arch/sh/boards/mach-se/7751/io.c b/arch/sh/boards/mach-se/7751/io.c deleted file mode 100644 index 6e75bd4459e5..000000000000 --- a/arch/sh/boards/mach-se/7751/io.c +++ /dev/null | |||
| @@ -1,119 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2001 Ian da Silva, Jeremy Siegel | ||
| 3 | * Based largely on io_se.c. | ||
| 4 | * | ||
| 5 | * I/O routine for Hitachi 7751 SolutionEngine. | ||
| 6 | * | ||
| 7 | * Initial version only to support LAN access; some | ||
| 8 | * placeholder code from io_se.c left in with the | ||
| 9 | * expectation of later SuperIO and PCMCIA access. | ||
| 10 | */ | ||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/types.h> | ||
| 13 | #include <linux/pci.h> | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <mach-se/mach/se7751.h> | ||
| 16 | #include <asm/addrspace.h> | ||
| 17 | |||
| 18 | static inline volatile u16 *port2adr(unsigned int port) | ||
| 19 | { | ||
| 20 | if (port >= 0x2000) | ||
| 21 | return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000)); | ||
| 22 | maybebadio((unsigned long)port); | ||
| 23 | return (volatile __u16*)port; | ||
| 24 | } | ||
| 25 | |||
| 26 | /* | ||
| 27 | * General outline: remap really low stuff [eventually] to SuperIO, | ||
| 28 | * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO) | ||
| 29 | * is mapped through the PCI IO window. Stuff with high bits (PXSEG) | ||
| 30 | * should be way beyond the window, and is used w/o translation for | ||
| 31 | * compatibility. | ||
| 32 | */ | ||
| 33 | unsigned char sh7751se_inb(unsigned long port) | ||
| 34 | { | ||
| 35 | if (PXSEG(port)) | ||
| 36 | return *(volatile unsigned char *)port; | ||
| 37 | else | ||
| 38 | return (*port2adr(port)) & 0xff; | ||
| 39 | } | ||
| 40 | |||
| 41 | unsigned char sh7751se_inb_p(unsigned long port) | ||
| 42 | { | ||
| 43 | unsigned char v; | ||
| 44 | |||
| 45 | if (PXSEG(port)) | ||
| 46 | v = *(volatile unsigned char *)port; | ||
| 47 | else | ||
| 48 | v = (*port2adr(port)) & 0xff; | ||
| 49 | ctrl_delay(); | ||
| 50 | return v; | ||
| 51 | } | ||
| 52 | |||
| 53 | unsigned short sh7751se_inw(unsigned long port) | ||
| 54 | { | ||
| 55 | if (PXSEG(port)) | ||
| 56 | return *(volatile unsigned short *)port; | ||
| 57 | else if (port >= 0x2000) | ||
| 58 | return *port2adr(port); | ||
| 59 | else | ||
| 60 | maybebadio(port); | ||
| 61 | return 0; | ||
| 62 | } | ||
| 63 | |||
| 64 | unsigned int sh7751se_inl(unsigned long port) | ||
| 65 | { | ||
| 66 | if (PXSEG(port)) | ||
| 67 | return *(volatile unsigned long *)port; | ||
| 68 | else if (port >= 0x2000) | ||
| 69 | return *port2adr(port); | ||
| 70 | else | ||
| 71 | maybebadio(port); | ||
| 72 | return 0; | ||
| 73 | } | ||
| 74 | |||
| 75 | void sh7751se_outb(unsigned char value, unsigned long port) | ||
| 76 | { | ||
| 77 | |||
| 78 | if (PXSEG(port)) | ||
| 79 | *(volatile unsigned char *)port = value; | ||
| 80 | else | ||
| 81 | *(port2adr(port)) = value; | ||
| 82 | } | ||
| 83 | |||
| 84 | void sh7751se_outb_p(unsigned char value, unsigned long port) | ||
| 85 | { | ||
| 86 | if (PXSEG(port)) | ||
| 87 | *(volatile unsigned char *)port = value; | ||
| 88 | else | ||
| 89 | *(port2adr(port)) = value; | ||
| 90 | ctrl_delay(); | ||
| 91 | } | ||
| 92 | |||
| 93 | void sh7751se_outw(unsigned short value, unsigned long port) | ||
| 94 | { | ||
| 95 | if (PXSEG(port)) | ||
| 96 | *(volatile unsigned short *)port = value; | ||
| 97 | else if (port >= 0x2000) | ||
| 98 | *port2adr(port) = value; | ||
| 99 | else | ||
| 100 | maybebadio(port); | ||
| 101 | } | ||
| 102 | |||
| 103 | void sh7751se_outl(unsigned int value, unsigned long port) | ||
| 104 | { | ||
| 105 | if (PXSEG(port)) | ||
| 106 | *(volatile unsigned long *)port = value; | ||
| 107 | else | ||
| 108 | maybebadio(port); | ||
| 109 | } | ||
| 110 | |||
| 111 | void sh7751se_insl(unsigned long port, void *addr, unsigned long count) | ||
| 112 | { | ||
| 113 | maybebadio(port); | ||
| 114 | } | ||
| 115 | |||
| 116 | void sh7751se_outsl(unsigned long port, const void *addr, unsigned long count) | ||
| 117 | { | ||
| 118 | maybebadio(port); | ||
| 119 | } | ||
diff --git a/arch/sh/boards/mach-se/7751/setup.c b/arch/sh/boards/mach-se/7751/setup.c index 50572512e3e8..9fbc51beb181 100644 --- a/arch/sh/boards/mach-se/7751/setup.c +++ b/arch/sh/boards/mach-se/7751/setup.c | |||
| @@ -56,23 +56,5 @@ __initcall(se7751_devices_setup); | |||
| 56 | static struct sh_machine_vector mv_7751se __initmv = { | 56 | static struct sh_machine_vector mv_7751se __initmv = { |
| 57 | .mv_name = "7751 SolutionEngine", | 57 | .mv_name = "7751 SolutionEngine", |
| 58 | .mv_nr_irqs = 72, | 58 | .mv_nr_irqs = 72, |
| 59 | |||
| 60 | .mv_inb = sh7751se_inb, | ||
| 61 | .mv_inw = sh7751se_inw, | ||
| 62 | .mv_inl = sh7751se_inl, | ||
| 63 | .mv_outb = sh7751se_outb, | ||
| 64 | .mv_outw = sh7751se_outw, | ||
| 65 | .mv_outl = sh7751se_outl, | ||
| 66 | |||
| 67 | .mv_inb_p = sh7751se_inb_p, | ||
| 68 | .mv_inw_p = sh7751se_inw, | ||
| 69 | .mv_inl_p = sh7751se_inl, | ||
| 70 | .mv_outb_p = sh7751se_outb_p, | ||
| 71 | .mv_outw_p = sh7751se_outw, | ||
| 72 | .mv_outl_p = sh7751se_outl, | ||
| 73 | |||
| 74 | .mv_insl = sh7751se_insl, | ||
| 75 | .mv_outsl = sh7751se_outsl, | ||
| 76 | |||
| 77 | .mv_init_irq = init_7751se_IRQ, | 59 | .mv_init_irq = init_7751se_IRQ, |
| 78 | }; | 60 | }; |
