diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 18:12:58 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 08:19:36 -0400 |
commit | dcf8abfcb0816adfb9bb175cbea00d7a1a2cae69 (patch) | |
tree | 5ad43699e0a8f240b84dd90417e54a50191d9763 /drivers/mtd | |
parent | 75d0c37419abd3757e139c7bbb20d52e12d2791e (diff) |
mtd: remove h720x flash support
The h720x platform support is going away in linux-3.10, so the
MTD driver will also not be needed any more.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 7 | ||||
-rw-r--r-- | drivers/mtd/maps/Makefile | 1 | ||||
-rw-r--r-- | drivers/mtd/maps/h720x-flash.c | 120 |
3 files changed, 0 insertions, 128 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 4b70976b2cc5..bed9634026ce 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -311,13 +311,6 @@ config MTD_IMPA7 | |||
311 | This enables access to the NOR Flash on the impA7 board of | 311 | This enables access to the NOR Flash on the impA7 board of |
312 | implementa GmbH. If you have such a board, say 'Y' here. | 312 | implementa GmbH. If you have such a board, say 'Y' here. |
313 | 313 | ||
314 | config MTD_H720X | ||
315 | tristate "Hynix evaluation board mappings" | ||
316 | depends on MTD_CFI && ( ARCH_H7201 || ARCH_H7202 ) | ||
317 | help | ||
318 | This enables access to the flash chips on the Hynix evaluation boards. | ||
319 | If you have such a board, say 'Y'. | ||
320 | |||
321 | # This needs CFI or JEDEC, depending on the cards found. | 314 | # This needs CFI or JEDEC, depending on the cards found. |
322 | config MTD_PCI | 315 | config MTD_PCI |
323 | tristate "PCI MTD driver" | 316 | tristate "PCI MTD driver" |
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 781e4b8cb977..395a12444048 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
@@ -37,7 +37,6 @@ obj-$(CONFIG_MTD_IMPA7) += impa7.o | |||
37 | obj-$(CONFIG_MTD_UCLINUX) += uclinux.o | 37 | obj-$(CONFIG_MTD_UCLINUX) += uclinux.o |
38 | obj-$(CONFIG_MTD_NETtel) += nettel.o | 38 | obj-$(CONFIG_MTD_NETtel) += nettel.o |
39 | obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o | 39 | obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o |
40 | obj-$(CONFIG_MTD_H720X) += h720x-flash.o | ||
41 | obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o | 40 | obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o |
42 | obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o | 41 | obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o |
43 | obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o | 42 | obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o |
diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c deleted file mode 100644 index 8ed6cb4529d8..000000000000 --- a/drivers/mtd/maps/h720x-flash.c +++ /dev/null | |||
@@ -1,120 +0,0 @@ | |||
1 | /* | ||
2 | * Flash memory access on Hynix GMS30C7201/HMS30C7202 based | ||
3 | * evaluation boards | ||
4 | * | ||
5 | * (C) 2002 Jungjun Kim <jungjun.kim@hynix.com> | ||
6 | * 2003 Thomas Gleixner <tglx@linutronix.de> | ||
7 | */ | ||
8 | |||
9 | #include <linux/module.h> | ||
10 | #include <linux/types.h> | ||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/init.h> | ||
13 | #include <linux/errno.h> | ||
14 | #include <linux/slab.h> | ||
15 | |||
16 | #include <linux/mtd/mtd.h> | ||
17 | #include <linux/mtd/map.h> | ||
18 | #include <linux/mtd/partitions.h> | ||
19 | #include <mach/hardware.h> | ||
20 | #include <asm/io.h> | ||
21 | |||
22 | static struct mtd_info *mymtd; | ||
23 | |||
24 | static struct map_info h720x_map = { | ||
25 | .name = "H720X", | ||
26 | .bankwidth = 4, | ||
27 | .size = H720X_FLASH_SIZE, | ||
28 | .phys = H720X_FLASH_PHYS, | ||
29 | }; | ||
30 | |||
31 | static struct mtd_partition h720x_partitions[] = { | ||
32 | { | ||
33 | .name = "ArMon", | ||
34 | .size = 0x00080000, | ||
35 | .offset = 0, | ||
36 | .mask_flags = MTD_WRITEABLE | ||
37 | },{ | ||
38 | .name = "Env", | ||
39 | .size = 0x00040000, | ||
40 | .offset = 0x00080000, | ||
41 | .mask_flags = MTD_WRITEABLE | ||
42 | },{ | ||
43 | .name = "Kernel", | ||
44 | .size = 0x00180000, | ||
45 | .offset = 0x000c0000, | ||
46 | .mask_flags = MTD_WRITEABLE | ||
47 | },{ | ||
48 | .name = "Ramdisk", | ||
49 | .size = 0x00400000, | ||
50 | .offset = 0x00240000, | ||
51 | .mask_flags = MTD_WRITEABLE | ||
52 | },{ | ||
53 | .name = "jffs2", | ||
54 | .size = MTDPART_SIZ_FULL, | ||
55 | .offset = MTDPART_OFS_APPEND | ||
56 | } | ||
57 | }; | ||
58 | |||
59 | #define NUM_PARTITIONS ARRAY_SIZE(h720x_partitions) | ||
60 | |||
61 | /* | ||
62 | * Initialize FLASH support | ||
63 | */ | ||
64 | static int __init h720x_mtd_init(void) | ||
65 | { | ||
66 | h720x_map.virt = ioremap(h720x_map.phys, h720x_map.size); | ||
67 | |||
68 | if (!h720x_map.virt) { | ||
69 | printk(KERN_ERR "H720x-MTD: ioremap failed\n"); | ||
70 | return -EIO; | ||
71 | } | ||
72 | |||
73 | simple_map_init(&h720x_map); | ||
74 | |||
75 | // Probe for flash bankwidth 4 | ||
76 | printk (KERN_INFO "H720x-MTD probing 32bit FLASH\n"); | ||
77 | mymtd = do_map_probe("cfi_probe", &h720x_map); | ||
78 | if (!mymtd) { | ||
79 | printk (KERN_INFO "H720x-MTD probing 16bit FLASH\n"); | ||
80 | // Probe for bankwidth 2 | ||
81 | h720x_map.bankwidth = 2; | ||
82 | mymtd = do_map_probe("cfi_probe", &h720x_map); | ||
83 | } | ||
84 | |||
85 | if (mymtd) { | ||
86 | mymtd->owner = THIS_MODULE; | ||
87 | |||
88 | mtd_device_parse_register(mymtd, NULL, NULL, | ||
89 | h720x_partitions, NUM_PARTITIONS); | ||
90 | return 0; | ||
91 | } | ||
92 | |||
93 | iounmap((void *)h720x_map.virt); | ||
94 | return -ENXIO; | ||
95 | } | ||
96 | |||
97 | /* | ||
98 | * Cleanup | ||
99 | */ | ||
100 | static void __exit h720x_mtd_cleanup(void) | ||
101 | { | ||
102 | |||
103 | if (mymtd) { | ||
104 | mtd_device_unregister(mymtd); | ||
105 | map_destroy(mymtd); | ||
106 | } | ||
107 | |||
108 | if (h720x_map.virt) { | ||
109 | iounmap((void *)h720x_map.virt); | ||
110 | h720x_map.virt = 0; | ||
111 | } | ||
112 | } | ||
113 | |||
114 | |||
115 | module_init(h720x_mtd_init); | ||
116 | module_exit(h720x_mtd_cleanup); | ||
117 | |||
118 | MODULE_LICENSE("GPL"); | ||
119 | MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>"); | ||
120 | MODULE_DESCRIPTION("MTD map driver for Hynix evaluation boards"); | ||