diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-09-20 21:47:48 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-22 05:31:01 -0400 |
commit | e417fcfb857b809e5dabc9b252ad70f090d553d1 (patch) | |
tree | 2eaf33a95ad3ee0864604c13423360f743a7225f | |
parent | 6a545a0d6021a4d759ba6d0c1082d1abf8d64c84 (diff) |
[MTD] Remove iq80310 map driver
The iq80310 mtd map driver depends on ARCH_IQ80310, which isn't
defined anywhere in the tree (as we don't have 80310 support), and
furthermore, everything the driver does can be done with physmap
instead.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r-- | drivers/mtd/maps/Kconfig | 8 | ||||
-rw-r--r-- | drivers/mtd/maps/Makefile | 1 | ||||
-rw-r--r-- | drivers/mtd/maps/iq80310.c | 118 |
3 files changed, 0 insertions, 127 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 64d1b6a6c920..24747bdc3e19 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -447,14 +447,6 @@ config MTD_DC21285 | |||
447 | 21285 bridge used with Intel's StrongARM processors. More info at | 447 | 21285 bridge used with Intel's StrongARM processors. More info at |
448 | <http://www.intel.com/design/bridge/docs/21285_documentation.htm>. | 448 | <http://www.intel.com/design/bridge/docs/21285_documentation.htm>. |
449 | 449 | ||
450 | config MTD_IQ80310 | ||
451 | tristate "CFI Flash device mapped on the XScale IQ80310 board" | ||
452 | depends on MTD_CFI && ARCH_IQ80310 | ||
453 | help | ||
454 | This enables access routines for the flash chips on the Intel XScale | ||
455 | IQ80310 evaluation board. If you have one of these boards and would | ||
456 | like to use the flash chips on it, say 'Y'. | ||
457 | |||
458 | config MTD_IXP4XX | 450 | config MTD_IXP4XX |
459 | tristate "CFI Flash device mapped on Intel IXP4xx based systems" | 451 | tristate "CFI Flash device mapped on Intel IXP4xx based systems" |
460 | depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX | 452 | depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX |
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index ab71f172eb77..191c1928bbec 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
@@ -15,7 +15,6 @@ obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o | |||
15 | obj-$(CONFIG_MTD_CSTM_MIPS_IXX) += cstm_mips_ixx.o | 15 | obj-$(CONFIG_MTD_CSTM_MIPS_IXX) += cstm_mips_ixx.o |
16 | obj-$(CONFIG_MTD_DC21285) += dc21285.o | 16 | obj-$(CONFIG_MTD_DC21285) += dc21285.o |
17 | obj-$(CONFIG_MTD_DILNETPC) += dilnetpc.o | 17 | obj-$(CONFIG_MTD_DILNETPC) += dilnetpc.o |
18 | obj-$(CONFIG_MTD_IQ80310) += iq80310.o | ||
19 | obj-$(CONFIG_MTD_L440GX) += l440gx.o | 18 | obj-$(CONFIG_MTD_L440GX) += l440gx.o |
20 | obj-$(CONFIG_MTD_AMD76XROM) += amd76xrom.o | 19 | obj-$(CONFIG_MTD_AMD76XROM) += amd76xrom.o |
21 | obj-$(CONFIG_MTD_ICHXROM) += ichxrom.o | 20 | obj-$(CONFIG_MTD_ICHXROM) += ichxrom.o |
diff --git a/drivers/mtd/maps/iq80310.c b/drivers/mtd/maps/iq80310.c deleted file mode 100644 index 62d9e87d84e2..000000000000 --- a/drivers/mtd/maps/iq80310.c +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | /* | ||
2 | * $Id: iq80310.c,v 1.21 2005/11/07 11:14:27 gleixner Exp $ | ||
3 | * | ||
4 | * Mapping for the Intel XScale IQ80310 evaluation board | ||
5 | * | ||
6 | * Author: Nicolas Pitre | ||
7 | * Copyright: (C) 2001 MontaVista Software Inc. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/types.h> | ||
16 | #include <linux/kernel.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/slab.h> | ||
19 | #include <asm/io.h> | ||
20 | #include <linux/mtd/mtd.h> | ||
21 | #include <linux/mtd/map.h> | ||
22 | #include <linux/mtd/partitions.h> | ||
23 | |||
24 | |||
25 | #define WINDOW_ADDR 0 | ||
26 | #define WINDOW_SIZE 8*1024*1024 | ||
27 | #define BUSWIDTH 1 | ||
28 | |||
29 | static struct mtd_info *mymtd; | ||
30 | |||
31 | static struct map_info iq80310_map = { | ||
32 | .name = "IQ80310 flash", | ||
33 | .size = WINDOW_SIZE, | ||
34 | .bankwidth = BUSWIDTH, | ||
35 | .phys = WINDOW_ADDR | ||
36 | }; | ||
37 | |||
38 | static struct mtd_partition iq80310_partitions[4] = { | ||
39 | { | ||
40 | .name = "Firmware", | ||
41 | .size = 0x00080000, | ||
42 | .offset = 0, | ||
43 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
44 | },{ | ||
45 | .name = "Kernel", | ||
46 | .size = 0x000a0000, | ||
47 | .offset = 0x00080000, | ||
48 | },{ | ||
49 | .name = "Filesystem", | ||
50 | .size = 0x00600000, | ||
51 | .offset = 0x00120000 | ||
52 | },{ | ||
53 | .name = "RedBoot", | ||
54 | .size = 0x000e0000, | ||
55 | .offset = 0x00720000, | ||
56 | .mask_flags = MTD_WRITEABLE | ||
57 | } | ||
58 | }; | ||
59 | |||
60 | static struct mtd_info *mymtd; | ||
61 | static struct mtd_partition *parsed_parts; | ||
62 | static const char *probes[] = { "RedBoot", "cmdlinepart", NULL }; | ||
63 | |||
64 | static int __init init_iq80310(void) | ||
65 | { | ||
66 | struct mtd_partition *parts; | ||
67 | int nb_parts = 0; | ||
68 | int parsed_nr_parts = 0; | ||
69 | int ret; | ||
70 | |||
71 | iq80310_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE); | ||
72 | if (!iq80310_map.virt) { | ||
73 | printk("Failed to ioremap\n"); | ||
74 | return -EIO; | ||
75 | } | ||
76 | simple_map_init(&iq80310_map); | ||
77 | |||
78 | mymtd = do_map_probe("cfi_probe", &iq80310_map); | ||
79 | if (!mymtd) { | ||
80 | iounmap((void *)iq80310_map.virt); | ||
81 | return -ENXIO; | ||
82 | } | ||
83 | mymtd->owner = THIS_MODULE; | ||
84 | |||
85 | ret = parse_mtd_partitions(mymtd, probes, &parsed_parts, 0); | ||
86 | |||
87 | if (ret > 0) | ||
88 | parsed_nr_parts = ret; | ||
89 | |||
90 | if (parsed_nr_parts > 0) { | ||
91 | parts = parsed_parts; | ||
92 | nb_parts = parsed_nr_parts; | ||
93 | } else { | ||
94 | parts = iq80310_partitions; | ||
95 | nb_parts = ARRAY_SIZE(iq80310_partitions); | ||
96 | } | ||
97 | add_mtd_partitions(mymtd, parts, nb_parts); | ||
98 | return 0; | ||
99 | } | ||
100 | |||
101 | static void __exit cleanup_iq80310(void) | ||
102 | { | ||
103 | if (mymtd) { | ||
104 | del_mtd_partitions(mymtd); | ||
105 | map_destroy(mymtd); | ||
106 | kfree(parsed_parts); | ||
107 | } | ||
108 | if (iq80310_map.virt) | ||
109 | iounmap((void *)iq80310_map.virt); | ||
110 | } | ||
111 | |||
112 | module_init(init_iq80310); | ||
113 | module_exit(cleanup_iq80310); | ||
114 | |||
115 | |||
116 | MODULE_LICENSE("GPL"); | ||
117 | MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>"); | ||
118 | MODULE_DESCRIPTION("MTD map driver for Intel XScale IQ80310 evaluation board"); | ||