1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
diff -Nurb linux/drivers/mtd/maps/Config.in linux-mips-2.4.24-pre2+mtd-2004-01-27+mtx-map/drivers/mtd/maps/Config.in
--- linux/drivers/mtd/maps/Config.in 2004-11-17 18:17:59.049312400 +0100
+++ linux-mips-2.4.24-pre2+mtd-2004-01-27+mtx-map/drivers/mtd/maps/Config.in 2004-11-17 18:12:26.000000000 +0100
@@ -80,6 +80,7 @@
bool ' Db1x00 boot flash device' CONFIG_MTD_DB1X00_BOOT
bool ' Db1x00 user flash device (2nd bank)' CONFIG_MTD_DB1X00_USER
fi
+ dep_tristate ' MTX-1 flash device' CONFIG_MTD_MTX1 $CONFIG_MIPS_MTX1
dep_tristate ' Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS
if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
hex ' Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
diff -Nurb linux/drivers/mtd/maps/Makefile linux-mips-2.4.24-pre2+mtd-2004-01-27+mtx-map/drivers/mtd/maps/Makefile
--- linux/drivers/mtd/maps/Makefile 2004-11-17 18:17:59.051312096 +0100
+++ linux-mips-2.4.24-pre2+mtd-2004-01-27+mtx-map/drivers/mtd/maps/Makefile 2004-11-17 18:12:26.000000000 +0100
@@ -49,6 +49,7 @@
obj-$(CONFIG_MTD_PCI) += pci.o
obj-$(CONFIG_MTD_PB1XXX) += pb1xxx-flash.o
obj-$(CONFIG_MTD_DB1X00) += db1x00-flash.o
+obj-$(CONFIG_MTD_MTX1) += mtx-1.o
obj-$(CONFIG_MTD_LASAT) += lasat.o
obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
obj-$(CONFIG_MTD_EDB7312) += edb7312.o
diff -Nurb linux/drivers/mtd/maps/mtx-1.c linux-mips-2.4.24-pre2+mtd-2004-01-27+mtx-map/drivers/mtd/maps/mtx-1.c
--- linux/drivers/mtd/maps/mtx-1.c 2004-11-17 18:17:02.689880336 +0100
+++ linux-mips-2.4.24-pre2+mtd-2004-01-27+mtx-map/drivers/mtd/maps/mtx-1.c 2004-11-17 18:12:26.000000000 +0100
@@ -1,166 +1,78 @@
/*
* Flash memory access on 4G Systems MTX-1 board
*
- * (C) 2003 Pete Popov <ppopov@mvista.com>
- * Bruno Randolf <bruno.randolf@4g-systems.de>
+ * (C) Bruno Randolf (4G Systeme GmbH) <bruno.randolf@4g-systems.biz>
*/
#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
+#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <asm/io.h>
-#include <asm/au1000.h>
-#ifdef DEBUG_RW
-#define DBG(x...) printk(x)
-#else
-#define DBG(x...)
-#endif
-
-#ifdef CONFIG_MIPS_MTX1
#define WINDOW_ADDR 0x1E000000
#define WINDOW_SIZE 0x2000000
-#endif
-
-__u8 physmap_read8(struct map_info *map, unsigned long ofs)
-{
- __u8 ret;
- ret = __raw_readb(map->map_priv_1 + ofs);
- DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- return ret;
-}
-
-__u16 physmap_read16(struct map_info *map, unsigned long ofs)
-{
- __u16 ret;
- ret = __raw_readw(map->map_priv_1 + ofs);
- DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- return ret;
-}
-
-__u32 physmap_read32(struct map_info *map, unsigned long ofs)
-{
- __u32 ret;
- ret = __raw_readl(map->map_priv_1 + ofs);
- DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret);
- return ret;
-}
-
-void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
-{
- DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to);
- memcpy_fromio(to, map->map_priv_1 + from, len);
-}
-
-void physmap_write8(struct map_info *map, __u8 d, unsigned long adr)
-{
- DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- __raw_writeb(d, map->map_priv_1 + adr);
- mb();
-}
-
-void physmap_write16(struct map_info *map, __u16 d, unsigned long adr)
-{
- DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- __raw_writew(d, map->map_priv_1 + adr);
- mb();
-}
-
-void physmap_write32(struct map_info *map, __u32 d, unsigned long adr)
-{
- DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d);
- __raw_writel(d, map->map_priv_1 + adr);
- mb();
-}
-
-void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-{
- DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from);
- memcpy_toio(map->map_priv_1 + to, from, len);
-}
-
-
+#define BUSWIDTH 4
static struct map_info mtx1_map = {
- name: "MTX-1 flash",
- read8: physmap_read8,
- read16: physmap_read16,
- read32: physmap_read32,
- copy_from: physmap_copy_from,
- write8: physmap_write8,
- write16: physmap_write16,
- write32: physmap_write32,
- copy_to: physmap_copy_to,
+ .name = "MTX-1 flash",
+ .size = WINDOW_SIZE,
+ .buswidth = BUSWIDTH,
+ .phys = WINDOW_ADDR
};
-
-static unsigned long flash_size = 0x01000000;
-static unsigned char flash_buswidth = 4;
static struct mtd_partition mtx1_partitions[] = {
{
- name: "user fs",
- size: 0x1c00000,
- offset: 0,
+ .name = "user fs",
+ .size = 0x1c00000,
+ .offset = 0,
},{
- name: "yamon",
- size: 0x0100000,
- offset: MTDPART_OFS_APPEND,
- mask_flags: MTD_WRITEABLE
+ .name = "yamon",
+ .size = 0x0100000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = MTD_WRITEABLE /* force read-only */
},{
- name: "raw kernel",
- size: 0x02c0000,
- offset: MTDPART_OFS_APPEND,
+ .name = "raw kernel",
+ .size = 0x02c0000,
+ .offset = MTDPART_OFS_APPEND,
},{
- name: "yamon env vars",
- size: 0x0040000,
- offset: MTDPART_OFS_APPEND,
- mask_flags: MTD_WRITEABLE
+ .name = "yamon environment",
+ .size = 0x0040000,
+ .offset = MTDPART_OFS_APPEND,
+ .mask_flags = MTD_WRITEABLE /* force read-only */
}
};
-
-#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
-
-static struct mtd_partition *parsed_parts;
static struct mtd_info *mymtd;
int __init mtx1_mtd_init(void)
{
- struct mtd_partition *parts;
- int nb_parts = 0;
- char *part_type;
+ printk(KERN_NOTICE "MTX-1 flash: probing %d-bit flash bus at %x\n",
+ mtx1_map.buswidth*8, WINDOW_ADDR);
- /* Default flash buswidth */
- mtx1_map.buswidth = flash_buswidth;
+ mtx1_map.virt = (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
+ if (!mtx1_map.virt) {
+ printk("mtx_mtd_init: failed to ioremap\n");
+ return -EIO;
+ }
+
+ simple_map_init(&mtx1_map);
- /*
- * Static partition definition selection
- */
- part_type = "static";
- parts = mtx1_partitions;
- nb_parts = NB_OF(mtx1_partitions);
- mtx1_map.size = flash_size;
-
- /*
- * Now let's probe for the actual flash. Do it here since
- * specific machine settings might have been set above.
- */
- printk(KERN_NOTICE "MTX-1 flash: probing %d-bit flash bus\n",
- mtx1_map.buswidth*8);
- mtx1_map.map_priv_1 =
- (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE);
mymtd = do_map_probe("cfi_probe", &mtx1_map);
- if (!mymtd) return -ENXIO;
- mymtd->module = THIS_MODULE;
+ if (!mymtd) {
+ iounmap(mtx1_map.virt);
+ return -ENXIO;
+ }
+
+ mymtd->owner = THIS_MODULE;
- add_mtd_partitions(mymtd, parts, nb_parts);
- return 0;
+ return add_mtd_partitions(mymtd, mtx1_partitions, ARRAY_SIZE(mtx1_partitions));
}
static void __exit mtx1_mtd_cleanup(void)
@@ -168,14 +80,14 @@
if (mymtd) {
del_mtd_partitions(mymtd);
map_destroy(mymtd);
- if (parsed_parts)
- kfree(parsed_parts);
}
+ if (mtx1_map.virt)
+ iounmap(mtx1_map.virt);
}
module_init(mtx1_mtd_init);
module_exit(mtx1_mtd_cleanup);
-MODULE_AUTHOR("Pete Popov");
+MODULE_AUTHOR("Bruno Randolf <bruno.randolf@4g-systems.biz>");
MODULE_DESCRIPTION("MTX-1 CFI map driver");
MODULE_LICENSE("GPL");
|
