diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-03-24 19:49:03 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-03-24 21:09:19 -0400 |
commit | 61dd7eb876344904aece6b1837da6ea1cbadbc07 (patch) | |
tree | 5df3c29cfb7efd2844f6acdc354bfe30981336df /drivers/mtd | |
parent | 4b08e149c0e02e97ec49c2a31d14a0d3a02f8074 (diff) |
[MTD] [MAPS] Drop now unused sharpsl-flash map
Now as all PXA Zaurii are converted to use the physmap map,
drop the sharpsl-flash map completely.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 6 | ||||
-rw-r--r-- | drivers/mtd/maps/Makefile | 1 | ||||
-rw-r--r-- | drivers/mtd/maps/sharpsl-flash.c | 116 |
3 files changed, 0 insertions, 123 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index a0da8e243cc4..a2d9b95bcdd7 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -529,12 +529,6 @@ config MTD_DMV182 | |||
529 | help | 529 | help |
530 | Map driver for Dy-4 SVME/DMV-182 board. | 530 | Map driver for Dy-4 SVME/DMV-182 board. |
531 | 531 | ||
532 | config MTD_SHARP_SL | ||
533 | tristate "ROM mapped on Sharp SL Series" | ||
534 | depends on ARCH_PXA | ||
535 | help | ||
536 | This enables access to the flash chip on the Sharp SL Series of PDAs. | ||
537 | |||
538 | config MTD_INTEL_VR_NOR | 532 | config MTD_INTEL_VR_NOR |
539 | tristate "NOR flash on Intel Vermilion Range Expansion Bus CS0" | 533 | tristate "NOR flash on Intel Vermilion Range Expansion Bus CS0" |
540 | depends on PCI | 534 | depends on PCI |
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index f53a7dc4a4fb..ba62013485a7 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
@@ -56,7 +56,6 @@ obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o | |||
56 | obj-$(CONFIG_MTD_IXP2000) += ixp2000.o | 56 | obj-$(CONFIG_MTD_IXP2000) += ixp2000.o |
57 | obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o | 57 | obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o |
58 | obj-$(CONFIG_MTD_DMV182) += dmv182.o | 58 | obj-$(CONFIG_MTD_DMV182) += dmv182.o |
59 | obj-$(CONFIG_MTD_SHARP_SL) += sharpsl-flash.o | ||
60 | obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o | 59 | obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o |
61 | obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o | 60 | obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o |
62 | obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o | 61 | obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o |
diff --git a/drivers/mtd/maps/sharpsl-flash.c b/drivers/mtd/maps/sharpsl-flash.c deleted file mode 100644 index b392f096c706..000000000000 --- a/drivers/mtd/maps/sharpsl-flash.c +++ /dev/null | |||
@@ -1,116 +0,0 @@ | |||
1 | /* | ||
2 | * sharpsl-flash.c | ||
3 | * | ||
4 | * Copyright (C) 2001 Lineo Japan, Inc. | ||
5 | * Copyright (C) 2002 SHARP | ||
6 | * | ||
7 | * based on rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp | ||
8 | * Handle mapping of the flash on the RPX Lite and CLLF boards | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation; either version 2 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * This program is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | */ | ||
21 | |||
22 | #include <linux/module.h> | ||
23 | #include <linux/types.h> | ||
24 | #include <linux/kernel.h> | ||
25 | #include <linux/mtd/mtd.h> | ||
26 | #include <linux/mtd/map.h> | ||
27 | #include <linux/mtd/partitions.h> | ||
28 | #include <asm/io.h> | ||
29 | #include <asm/mach-types.h> | ||
30 | |||
31 | #define WINDOW_ADDR 0x00000000 | ||
32 | #define WINDOW_SIZE 0x00800000 | ||
33 | #define BANK_WIDTH 2 | ||
34 | |||
35 | static struct mtd_info *mymtd; | ||
36 | |||
37 | struct map_info sharpsl_map = { | ||
38 | .name = "sharpsl-flash", | ||
39 | .size = WINDOW_SIZE, | ||
40 | .bankwidth = BANK_WIDTH, | ||
41 | .phys = WINDOW_ADDR | ||
42 | }; | ||
43 | |||
44 | static struct mtd_partition sharpsl_partitions[1] = { | ||
45 | { | ||
46 | name: "Boot PROM Filesystem", | ||
47 | } | ||
48 | }; | ||
49 | |||
50 | static int __init init_sharpsl(void) | ||
51 | { | ||
52 | struct mtd_partition *parts; | ||
53 | int nb_parts = 0; | ||
54 | char *part_type = "static"; | ||
55 | |||
56 | printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n", | ||
57 | WINDOW_SIZE, WINDOW_ADDR); | ||
58 | sharpsl_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE); | ||
59 | if (!sharpsl_map.virt) { | ||
60 | printk("Failed to ioremap\n"); | ||
61 | return -EIO; | ||
62 | } | ||
63 | |||
64 | simple_map_init(&sharpsl_map); | ||
65 | |||
66 | mymtd = do_map_probe("map_rom", &sharpsl_map); | ||
67 | if (!mymtd) { | ||
68 | iounmap(sharpsl_map.virt); | ||
69 | return -ENXIO; | ||
70 | } | ||
71 | |||
72 | mymtd->owner = THIS_MODULE; | ||
73 | |||
74 | if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky() | ||
75 | || machine_is_poodle()) { | ||
76 | sharpsl_partitions[0].size=0x006d0000; | ||
77 | sharpsl_partitions[0].offset=0x00120000; | ||
78 | } else if (machine_is_tosa()) { | ||
79 | sharpsl_partitions[0].size=0x006a0000; | ||
80 | sharpsl_partitions[0].offset=0x00160000; | ||
81 | } else if (machine_is_spitz() || machine_is_akita() || machine_is_borzoi()) { | ||
82 | sharpsl_partitions[0].size=0x006b0000; | ||
83 | sharpsl_partitions[0].offset=0x00140000; | ||
84 | } else { | ||
85 | map_destroy(mymtd); | ||
86 | iounmap(sharpsl_map.virt); | ||
87 | return -ENODEV; | ||
88 | } | ||
89 | |||
90 | parts = sharpsl_partitions; | ||
91 | nb_parts = ARRAY_SIZE(sharpsl_partitions); | ||
92 | |||
93 | printk(KERN_NOTICE "Using %s partition definition\n", part_type); | ||
94 | add_mtd_partitions(mymtd, parts, nb_parts); | ||
95 | |||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | static void __exit cleanup_sharpsl(void) | ||
100 | { | ||
101 | if (mymtd) { | ||
102 | del_mtd_partitions(mymtd); | ||
103 | map_destroy(mymtd); | ||
104 | } | ||
105 | if (sharpsl_map.virt) { | ||
106 | iounmap(sharpsl_map.virt); | ||
107 | sharpsl_map.virt = 0; | ||
108 | } | ||
109 | } | ||
110 | |||
111 | module_init(init_sharpsl); | ||
112 | module_exit(cleanup_sharpsl); | ||
113 | |||
114 | MODULE_LICENSE("GPL"); | ||
115 | MODULE_AUTHOR("SHARP (Original: Arnold Christensen <AKC@pel.dk>)"); | ||
116 | MODULE_DESCRIPTION("MTD map driver for SHARP SL series"); | ||