diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-05-09 03:13:31 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-05-09 04:43:02 -0400 |
commit | 025257c7a7665a117b72097cc12021140eac8a34 (patch) | |
tree | 4361d7eabb8f391864c142f52d8b6b7a43cfe99e /drivers/mtd/maps | |
parent | 2d0fa586facb740b9ef9a01dcedc94c126c6f148 (diff) |
[MTD] [MAPS] Remove flash maps for no longer supported 405LP boards
drivers/mtd/maps includes flash maps for the Beech and Arctic PowerPC
405LP based boards. However, the 405LP was discontinued before any
quantity were distributed and those boards no longer have kernel
support in general. Therefore, this patch removes this obsolete code.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 16 | ||||
-rw-r--r-- | drivers/mtd/maps/Makefile | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/arctic-mtd.c | 145 | ||||
-rw-r--r-- | drivers/mtd/maps/beech-mtd.c | 122 |
4 files changed, 0 insertions, 285 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index d990d8141ef5..aab5506adfab 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -358,22 +358,6 @@ config MTD_CFI_FLAGADM | |||
358 | Mapping for the Flaga digital module. If you don't have one, ignore | 358 | Mapping for the Flaga digital module. If you don't have one, ignore |
359 | this setting. | 359 | this setting. |
360 | 360 | ||
361 | config MTD_BEECH | ||
362 | tristate "CFI Flash device mapped on IBM 405LP Beech" | ||
363 | depends on MTD_CFI && BEECH | ||
364 | help | ||
365 | This enables access routines for the flash chips on the IBM | ||
366 | 405LP Beech board. If you have one of these boards and would like | ||
367 | to use the flash chips on it, say 'Y'. | ||
368 | |||
369 | config MTD_ARCTIC | ||
370 | tristate "CFI Flash device mapped on IBM 405LP Arctic" | ||
371 | depends on MTD_CFI && ARCTIC2 | ||
372 | help | ||
373 | This enables access routines for the flash chips on the IBM 405LP | ||
374 | Arctic board. If you have one of these boards and would like to | ||
375 | use the flash chips on it, say 'Y'. | ||
376 | |||
377 | config MTD_WALNUT | 361 | config MTD_WALNUT |
378 | tristate "Flash device mapped on IBM 405GP Walnut" | 362 | tristate "Flash device mapped on IBM 405GP Walnut" |
379 | depends on MTD_JEDECPROBE && WALNUT | 363 | depends on MTD_JEDECPROBE && WALNUT |
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index de036c5e6139..3acbb5d01ca4 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
@@ -58,8 +58,6 @@ obj-$(CONFIG_MTD_NETtel) += nettel.o | |||
58 | obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o | 58 | obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o |
59 | obj-$(CONFIG_MTD_EBONY) += ebony.o | 59 | obj-$(CONFIG_MTD_EBONY) += ebony.o |
60 | obj-$(CONFIG_MTD_OCOTEA) += ocotea.o | 60 | obj-$(CONFIG_MTD_OCOTEA) += ocotea.o |
61 | obj-$(CONFIG_MTD_BEECH) += beech-mtd.o | ||
62 | obj-$(CONFIG_MTD_ARCTIC) += arctic-mtd.o | ||
63 | obj-$(CONFIG_MTD_WALNUT) += walnut.o | 61 | obj-$(CONFIG_MTD_WALNUT) += walnut.o |
64 | obj-$(CONFIG_MTD_H720X) += h720x-flash.o | 62 | obj-$(CONFIG_MTD_H720X) += h720x-flash.o |
65 | obj-$(CONFIG_MTD_SBC8240) += sbc8240.o | 63 | obj-$(CONFIG_MTD_SBC8240) += sbc8240.o |
diff --git a/drivers/mtd/maps/arctic-mtd.c b/drivers/mtd/maps/arctic-mtd.c deleted file mode 100644 index 2cc902436275..000000000000 --- a/drivers/mtd/maps/arctic-mtd.c +++ /dev/null | |||
@@ -1,145 +0,0 @@ | |||
1 | /* | ||
2 | * $Id: arctic-mtd.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $ | ||
3 | * | ||
4 | * drivers/mtd/maps/arctic-mtd.c MTD mappings and partition tables for | ||
5 | * IBM 405LP Arctic boards. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | * | ||
21 | * Copyright (C) 2002, International Business Machines Corporation | ||
22 | * All Rights Reserved. | ||
23 | * | ||
24 | * Bishop Brock | ||
25 | * IBM Research, Austin Center for Low-Power Computing | ||
26 | * bcbrock@us.ibm.com | ||
27 | * March 2002 | ||
28 | * | ||
29 | * modified for Arctic by, | ||
30 | * David Gibson | ||
31 | * IBM OzLabs, Canberra, Australia | ||
32 | * <arctic@gibson.dropbear.id.au> | ||
33 | */ | ||
34 | |||
35 | #include <linux/kernel.h> | ||
36 | #include <linux/module.h> | ||
37 | #include <linux/types.h> | ||
38 | #include <linux/init.h> | ||
39 | |||
40 | #include <linux/mtd/mtd.h> | ||
41 | #include <linux/mtd/map.h> | ||
42 | #include <linux/mtd/partitions.h> | ||
43 | |||
44 | #include <asm/io.h> | ||
45 | #include <asm/ibm4xx.h> | ||
46 | |||
47 | /* | ||
48 | * 0 : 0xFE00 0000 - 0xFEFF FFFF : Filesystem 1 (16MiB) | ||
49 | * 1 : 0xFF00 0000 - 0xFF4F FFFF : kernel (5.12MiB) | ||
50 | * 2 : 0xFF50 0000 - 0xFFF5 FFFF : Filesystem 2 (10.624MiB) (if non-XIP) | ||
51 | * 3 : 0xFFF6 0000 - 0xFFFF FFFF : PIBS Firmware (640KiB) | ||
52 | */ | ||
53 | |||
54 | #define FFS1_SIZE 0x01000000 /* 16MiB */ | ||
55 | #define KERNEL_SIZE 0x00500000 /* 5.12MiB */ | ||
56 | #define FFS2_SIZE 0x00a60000 /* 10.624MiB */ | ||
57 | #define FIRMWARE_SIZE 0x000a0000 /* 640KiB */ | ||
58 | |||
59 | |||
60 | #define NAME "Arctic Linux Flash" | ||
61 | #define PADDR SUBZERO_BOOTFLASH_PADDR | ||
62 | #define BUSWIDTH 2 | ||
63 | #define SIZE SUBZERO_BOOTFLASH_SIZE | ||
64 | #define PARTITIONS 4 | ||
65 | |||
66 | /* Flash memories on these boards are memory resources, accessed big-endian. */ | ||
67 | |||
68 | { | ||
69 | /* do nothing for now */ | ||
70 | } | ||
71 | |||
72 | static struct map_info arctic_mtd_map = { | ||
73 | .name = NAME, | ||
74 | .size = SIZE, | ||
75 | .bankwidth = BUSWIDTH, | ||
76 | .phys = PADDR, | ||
77 | }; | ||
78 | |||
79 | static struct mtd_info *arctic_mtd; | ||
80 | |||
81 | static struct mtd_partition arctic_partitions[PARTITIONS] = { | ||
82 | { .name = "Filesystem", | ||
83 | .size = FFS1_SIZE, | ||
84 | .offset = 0,}, | ||
85 | { .name = "Kernel", | ||
86 | .size = KERNEL_SIZE, | ||
87 | .offset = FFS1_SIZE,}, | ||
88 | { .name = "Filesystem", | ||
89 | .size = FFS2_SIZE, | ||
90 | .offset = FFS1_SIZE + KERNEL_SIZE,}, | ||
91 | { .name = "Firmware", | ||
92 | .size = FIRMWARE_SIZE, | ||
93 | .offset = SUBZERO_BOOTFLASH_SIZE - FIRMWARE_SIZE,}, | ||
94 | }; | ||
95 | |||
96 | static int __init | ||
97 | init_arctic_mtd(void) | ||
98 | { | ||
99 | int err; | ||
100 | |||
101 | printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR); | ||
102 | |||
103 | arctic_mtd_map.virt = ioremap(PADDR, SIZE); | ||
104 | |||
105 | if (!arctic_mtd_map.virt) { | ||
106 | printk("%s: failed to ioremap 0x%x\n", NAME, PADDR); | ||
107 | return -EIO; | ||
108 | } | ||
109 | simple_map_init(&arctic_mtd_map); | ||
110 | |||
111 | printk("%s: probing %d-bit flash bus\n", NAME, BUSWIDTH * 8); | ||
112 | arctic_mtd = do_map_probe("cfi_probe", &arctic_mtd_map); | ||
113 | |||
114 | if (!arctic_mtd) { | ||
115 | iounmap(arctic_mtd_map.virt); | ||
116 | return -ENXIO; | ||
117 | } | ||
118 | |||
119 | arctic_mtd->owner = THIS_MODULE; | ||
120 | |||
121 | err = add_mtd_partitions(arctic_mtd, arctic_partitions, PARTITIONS); | ||
122 | if (err) { | ||
123 | printk("%s: add_mtd_partitions failed\n", NAME); | ||
124 | iounmap(arctic_mtd_map.virt); | ||
125 | } | ||
126 | |||
127 | return err; | ||
128 | } | ||
129 | |||
130 | static void __exit | ||
131 | cleanup_arctic_mtd(void) | ||
132 | { | ||
133 | if (arctic_mtd) { | ||
134 | del_mtd_partitions(arctic_mtd); | ||
135 | map_destroy(arctic_mtd); | ||
136 | iounmap((void *) arctic_mtd_map.virt); | ||
137 | } | ||
138 | } | ||
139 | |||
140 | module_init(init_arctic_mtd); | ||
141 | module_exit(cleanup_arctic_mtd); | ||
142 | |||
143 | MODULE_LICENSE("GPL"); | ||
144 | MODULE_AUTHOR("David Gibson <arctic@gibson.dropbear.id.au>"); | ||
145 | MODULE_DESCRIPTION("MTD map and partitions for IBM 405LP Arctic boards"); | ||
diff --git a/drivers/mtd/maps/beech-mtd.c b/drivers/mtd/maps/beech-mtd.c deleted file mode 100644 index d76d5981b863..000000000000 --- a/drivers/mtd/maps/beech-mtd.c +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | /* | ||
2 | * $Id: beech-mtd.c,v 1.11 2005/11/07 11:14:26 gleixner Exp $ | ||
3 | * | ||
4 | * drivers/mtd/maps/beech-mtd.c MTD mappings and partition tables for | ||
5 | * IBM 405LP Beech boards. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | * | ||
21 | * Copyright (C) 2002, International Business Machines Corporation | ||
22 | * All Rights Reserved. | ||
23 | * | ||
24 | * Bishop Brock | ||
25 | * IBM Research, Austin Center for Low-Power Computing | ||
26 | * bcbrock@us.ibm.com | ||
27 | * March 2002 | ||
28 | * | ||
29 | */ | ||
30 | |||
31 | #include <linux/kernel.h> | ||
32 | #include <linux/module.h> | ||
33 | #include <linux/types.h> | ||
34 | #include <linux/init.h> | ||
35 | |||
36 | #include <linux/mtd/mtd.h> | ||
37 | #include <linux/mtd/map.h> | ||
38 | #include <linux/mtd/partitions.h> | ||
39 | |||
40 | #include <asm/io.h> | ||
41 | #include <asm/ibm4xx.h> | ||
42 | |||
43 | #define NAME "Beech Linux Flash" | ||
44 | #define PADDR BEECH_BIGFLASH_PADDR | ||
45 | #define SIZE BEECH_BIGFLASH_SIZE | ||
46 | #define BUSWIDTH 1 | ||
47 | |||
48 | /* Flash memories on these boards are memory resources, accessed big-endian. */ | ||
49 | |||
50 | |||
51 | static struct map_info beech_mtd_map = { | ||
52 | .name = NAME, | ||
53 | .size = SIZE, | ||
54 | .bankwidth = BUSWIDTH, | ||
55 | .phys = PADDR | ||
56 | }; | ||
57 | |||
58 | static struct mtd_info *beech_mtd; | ||
59 | |||
60 | static struct mtd_partition beech_partitions[2] = { | ||
61 | { | ||
62 | .name = "Linux Kernel", | ||
63 | .size = BEECH_KERNEL_SIZE, | ||
64 | .offset = BEECH_KERNEL_OFFSET | ||
65 | }, { | ||
66 | .name = "Free Area", | ||
67 | .size = BEECH_FREE_AREA_SIZE, | ||
68 | .offset = BEECH_FREE_AREA_OFFSET | ||
69 | } | ||
70 | }; | ||
71 | |||
72 | static int __init | ||
73 | init_beech_mtd(void) | ||
74 | { | ||
75 | int err; | ||
76 | |||
77 | printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR); | ||
78 | |||
79 | beech_mtd_map.virt = ioremap(PADDR, SIZE); | ||
80 | |||
81 | if (!beech_mtd_map.virt) { | ||
82 | printk("%s: failed to ioremap 0x%x\n", NAME, PADDR); | ||
83 | return -EIO; | ||
84 | } | ||
85 | |||
86 | simple_map_init(&beech_mtd_map); | ||
87 | |||
88 | printk("%s: probing %d-bit flash bus\n", NAME, BUSWIDTH * 8); | ||
89 | beech_mtd = do_map_probe("cfi_probe", &beech_mtd_map); | ||
90 | |||
91 | if (!beech_mtd) { | ||
92 | iounmap(beech_mtd_map.virt); | ||
93 | return -ENXIO; | ||
94 | } | ||
95 | |||
96 | beech_mtd->owner = THIS_MODULE; | ||
97 | |||
98 | err = add_mtd_partitions(beech_mtd, beech_partitions, 2); | ||
99 | if (err) { | ||
100 | printk("%s: add_mtd_partitions failed\n", NAME); | ||
101 | iounmap(beech_mtd_map.virt); | ||
102 | } | ||
103 | |||
104 | return err; | ||
105 | } | ||
106 | |||
107 | static void __exit | ||
108 | cleanup_beech_mtd(void) | ||
109 | { | ||
110 | if (beech_mtd) { | ||
111 | del_mtd_partitions(beech_mtd); | ||
112 | map_destroy(beech_mtd); | ||
113 | iounmap((void *) beech_mtd_map.virt); | ||
114 | } | ||
115 | } | ||
116 | |||
117 | module_init(init_beech_mtd); | ||
118 | module_exit(cleanup_beech_mtd); | ||
119 | |||
120 | MODULE_LICENSE("GPL"); | ||
121 | MODULE_AUTHOR("Bishop Brock <bcbrock@us.ibm.com>"); | ||
122 | MODULE_DESCRIPTION("MTD map and partitions for IBM 405LP Beech boards"); | ||