diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-07-31 03:38:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:39 -0400 |
commit | 99eb8a550dbccc0e1f6c7e866fe421810e0585f6 (patch) | |
tree | 130c6e3338a0655ba74355eba83afab9261e1ed0 /drivers/scsi | |
parent | 0d0ed42e5ca2e22465c591341839c18025748fe8 (diff) |
Remove the arm26 port
The arm26 port has been in a state where it was far from even compiling
for quite some time.
Ian Molton agreed with the removal.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Ian Molton <spyro@f2s.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/arm/Kconfig | 9 | ||||
-rw-r--r-- | drivers/scsi/arm/Makefile | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/ecoscsi.c | 166 |
3 files changed, 0 insertions, 176 deletions
diff --git a/drivers/scsi/arm/Kconfig b/drivers/scsi/arm/Kconfig index d006a8cb4a74..7236143941f3 100644 --- a/drivers/scsi/arm/Kconfig +++ b/drivers/scsi/arm/Kconfig | |||
@@ -74,15 +74,6 @@ config SCSI_CUMANA_1 | |||
74 | This enables support for the Cumana SCSI I card. If you have an | 74 | This enables support for the Cumana SCSI I card. If you have an |
75 | Acorn system with one of these, say Y. If unsure, say N. | 75 | Acorn system with one of these, say Y. If unsure, say N. |
76 | 76 | ||
77 | config SCSI_ECOSCSI | ||
78 | tristate "EcoScsi support (EXPERIMENTAL)" | ||
79 | depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI | ||
80 | select SCSI_SPI_ATTRS | ||
81 | help | ||
82 | This enables support for the EcoSCSI card -- a small card that sits | ||
83 | in the Econet socket. If you have an Acorn system with one of these, | ||
84 | say Y. If unsure, say N. | ||
85 | |||
86 | config SCSI_OAK1 | 77 | config SCSI_OAK1 |
87 | tristate "Oak SCSI support (EXPERIMENTAL)" | 78 | tristate "Oak SCSI support (EXPERIMENTAL)" |
88 | depends on ARCH_ACORN && EXPERIMENTAL && SCSI | 79 | depends on ARCH_ACORN && EXPERIMENTAL && SCSI |
diff --git a/drivers/scsi/arm/Makefile b/drivers/scsi/arm/Makefile index e8db17924c1d..16c3e86a6b1b 100644 --- a/drivers/scsi/arm/Makefile +++ b/drivers/scsi/arm/Makefile | |||
@@ -8,7 +8,6 @@ obj-$(CONFIG_SCSI_ACORNSCSI_3) += acornscsi_mod.o queue.o msgqueue.o | |||
8 | obj-$(CONFIG_SCSI_ARXESCSI) += arxescsi.o fas216.o queue.o msgqueue.o | 8 | obj-$(CONFIG_SCSI_ARXESCSI) += arxescsi.o fas216.o queue.o msgqueue.o |
9 | obj-$(CONFIG_SCSI_CUMANA_1) += cumana_1.o | 9 | obj-$(CONFIG_SCSI_CUMANA_1) += cumana_1.o |
10 | obj-$(CONFIG_SCSI_CUMANA_2) += cumana_2.o fas216.o queue.o msgqueue.o | 10 | obj-$(CONFIG_SCSI_CUMANA_2) += cumana_2.o fas216.o queue.o msgqueue.o |
11 | obj-$(CONFIG_SCSI_ECOSCSI) += ecoscsi.o | ||
12 | obj-$(CONFIG_SCSI_OAK1) += oak.o | 11 | obj-$(CONFIG_SCSI_OAK1) += oak.o |
13 | obj-$(CONFIG_SCSI_POWERTECSCSI) += powertec.o fas216.o queue.o msgqueue.o | 12 | obj-$(CONFIG_SCSI_POWERTECSCSI) += powertec.o fas216.o queue.o msgqueue.o |
14 | obj-$(CONFIG_SCSI_EESOXSCSI) += eesox.o fas216.o queue.o msgqueue.o | 13 | obj-$(CONFIG_SCSI_EESOXSCSI) += eesox.o fas216.o queue.o msgqueue.o |
diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c deleted file mode 100644 index 5265a9884338..000000000000 --- a/drivers/scsi/arm/ecoscsi.c +++ /dev/null | |||
@@ -1,166 +0,0 @@ | |||
1 | #define AUTOSENSE | ||
2 | /* #define PSEUDO_DMA */ | ||
3 | |||
4 | /* | ||
5 | * EcoSCSI Generic NCR5380 driver | ||
6 | * | ||
7 | * Copyright 1995, Russell King | ||
8 | * | ||
9 | * ALPHA RELEASE 1. | ||
10 | * | ||
11 | * For more information, please consult | ||
12 | * | ||
13 | * NCR 5380 Family | ||
14 | * SCSI Protocol Controller | ||
15 | * Databook | ||
16 | * | ||
17 | * NCR Microelectronics | ||
18 | * 1635 Aeroplaza Drive | ||
19 | * Colorado Springs, CO 80916 | ||
20 | * 1+ (719) 578-3400 | ||
21 | * 1+ (800) 334-5454 | ||
22 | */ | ||
23 | |||
24 | #include <linux/module.h> | ||
25 | #include <linux/signal.h> | ||
26 | #include <linux/ioport.h> | ||
27 | #include <linux/delay.h> | ||
28 | #include <linux/init.h> | ||
29 | #include <linux/blkdev.h> | ||
30 | |||
31 | #include <asm/io.h> | ||
32 | #include <asm/system.h> | ||
33 | |||
34 | #include "../scsi.h" | ||
35 | #include <scsi/scsi_host.h> | ||
36 | |||
37 | #define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata) | ||
38 | |||
39 | #define NCR5380_local_declare() void __iomem *_base | ||
40 | #define NCR5380_setup(host) _base = priv(host)->base | ||
41 | |||
42 | #define NCR5380_read(reg) ({ writeb(reg | 8, _base); readb(_base + 4); }) | ||
43 | #define NCR5380_write(reg, value) ({ writeb(reg | 8, _base); writeb(value, _base + 4); }) | ||
44 | |||
45 | #define NCR5380_intr ecoscsi_intr | ||
46 | #define NCR5380_queue_command ecoscsi_queue_command | ||
47 | #define NCR5380_proc_info ecoscsi_proc_info | ||
48 | |||
49 | #define NCR5380_implementation_fields \ | ||
50 | void __iomem *base | ||
51 | |||
52 | #include "../NCR5380.h" | ||
53 | |||
54 | #define ECOSCSI_PUBLIC_RELEASE 1 | ||
55 | |||
56 | /* | ||
57 | * Function : ecoscsi_setup(char *str, int *ints) | ||
58 | * | ||
59 | * Purpose : LILO command line initialization of the overrides array, | ||
60 | * | ||
61 | * Inputs : str - unused, ints - array of integer parameters with ints[0] | ||
62 | * equal to the number of ints. | ||
63 | * | ||
64 | */ | ||
65 | |||
66 | void ecoscsi_setup(char *str, int *ints) | ||
67 | { | ||
68 | } | ||
69 | |||
70 | const char * ecoscsi_info (struct Scsi_Host *spnt) | ||
71 | { | ||
72 | return ""; | ||
73 | } | ||
74 | |||
75 | #define BOARD_NORMAL 0 | ||
76 | #define BOARD_NCR53C400 1 | ||
77 | |||
78 | #include "../NCR5380.c" | ||
79 | |||
80 | static struct scsi_host_template ecoscsi_template = { | ||
81 | .module = THIS_MODULE, | ||
82 | .name = "Serial Port EcoSCSI NCR5380", | ||
83 | .proc_name = "ecoscsi", | ||
84 | .info = ecoscsi_info, | ||
85 | .queuecommand = ecoscsi_queue_command, | ||
86 | .eh_abort_handler = NCR5380_abort, | ||
87 | .eh_bus_reset_handler = NCR5380_bus_reset, | ||
88 | .can_queue = 16, | ||
89 | .this_id = 7, | ||
90 | .sg_tablesize = SG_ALL, | ||
91 | .cmd_per_lun = 2, | ||
92 | .use_clustering = DISABLE_CLUSTERING | ||
93 | }; | ||
94 | |||
95 | static struct Scsi_Host *host; | ||
96 | |||
97 | static int __init ecoscsi_init(void) | ||
98 | { | ||
99 | void __iomem *_base; | ||
100 | int ret; | ||
101 | |||
102 | if (!request_mem_region(0x33a0000, 4096, "ecoscsi")) { | ||
103 | ret = -EBUSY; | ||
104 | goto out; | ||
105 | } | ||
106 | |||
107 | _base = ioremap(0x33a0000, 4096); | ||
108 | if (!_base) { | ||
109 | ret = -ENOMEM; | ||
110 | goto out_release; | ||
111 | } | ||
112 | |||
113 | NCR5380_write(MODE_REG, 0x20); /* Is it really SCSI? */ | ||
114 | if (NCR5380_read(MODE_REG) != 0x20) /* Write to a reg. */ | ||
115 | goto out_unmap; | ||
116 | |||
117 | NCR5380_write(MODE_REG, 0x00); /* it back. */ | ||
118 | if (NCR5380_read(MODE_REG) != 0x00) | ||
119 | goto out_unmap; | ||
120 | |||
121 | host = scsi_host_alloc(tpnt, sizeof(struct NCR5380_hostdata)); | ||
122 | if (!host) { | ||
123 | ret = -ENOMEM; | ||
124 | goto out_unmap; | ||
125 | } | ||
126 | |||
127 | priv(host)->base = _base; | ||
128 | host->irq = IRQ_NONE; | ||
129 | |||
130 | NCR5380_init(host, 0); | ||
131 | |||
132 | printk("scsi%d: at port 0x%08lx irqs disabled", host->host_no, host->io_port); | ||
133 | printk(" options CAN_QUEUE=%d CMD_PER_LUN=%d release=%d", | ||
134 | host->can_queue, host->cmd_per_lun, ECOSCSI_PUBLIC_RELEASE); | ||
135 | printk("\nscsi%d:", host->host_no); | ||
136 | NCR5380_print_options(host); | ||
137 | printk("\n"); | ||
138 | |||
139 | scsi_add_host(host, NULL); /* XXX handle failure */ | ||
140 | scsi_scan_host(host); | ||
141 | return 0; | ||
142 | |||
143 | out_unmap: | ||
144 | iounmap(_base); | ||
145 | out_release: | ||
146 | release_mem_region(0x33a0000, 4096); | ||
147 | out: | ||
148 | return ret; | ||
149 | } | ||
150 | |||
151 | static void __exit ecoscsi_exit(void) | ||
152 | { | ||
153 | scsi_remove_host(host); | ||
154 | NCR5380_exit(host); | ||
155 | scsi_host_put(host); | ||
156 | release_mem_region(0x33a0000, 4096); | ||
157 | return 0; | ||
158 | } | ||
159 | |||
160 | module_init(ecoscsi_init); | ||
161 | module_exit(ecoscsi_exit); | ||
162 | |||
163 | MODULE_AUTHOR("Russell King"); | ||
164 | MODULE_DESCRIPTION("Econet-SCSI driver for Acorn machines"); | ||
165 | MODULE_LICENSE("GPL"); | ||
166 | |||