Commit 1b9e349f authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.5-rmk

into home.transmeta.com:/home/torvalds/v2.5/linux
parents b5671292 fea45e9c
...@@ -3131,9 +3131,18 @@ void mgslpc_remove_device(MGSLPC_INFO *remove_info) ...@@ -3131,9 +3131,18 @@ void mgslpc_remove_device(MGSLPC_INFO *remove_info)
} }
} }
static struct pcmcia_driver mgslpc_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "synclink_cs",
},
.attach = mgslpc_attach,
.detach = mgslpc_detach,
};
static int __init synclink_cs_init(void) static int __init synclink_cs_init(void)
{ {
servinfo_t serv; int error;
if (break_on_load) { if (break_on_load) {
mgslpc_get_text_ptr(); mgslpc_get_text_ptr();
...@@ -3142,13 +3151,9 @@ static int __init synclink_cs_init(void) ...@@ -3142,13 +3151,9 @@ static int __init synclink_cs_init(void)
printk("%s %s\n", driver_name, driver_version); printk("%s %s\n", driver_name, driver_version);
CardServices(GetCardServicesInfo, &serv); error = pcmcia_register_driver(&mgslpc_driver);
if (serv.Revision != CS_RELEASE_CODE) { if (error)
printk(KERN_NOTICE "synclink_cs: Card Services release " return error;
"does not match!\n");
return -1;
}
register_pccard_driver(&dev_info, &mgslpc_attach, &mgslpc_detach);
/* Initialize the tty_driver structure */ /* Initialize the tty_driver structure */
...@@ -3217,7 +3222,9 @@ static void __exit synclink_cs_exit(void) ...@@ -3217,7 +3222,9 @@ static void __exit synclink_cs_exit(void)
printk("%s(%d) failed to unregister tty driver err=%d\n", printk("%s(%d) failed to unregister tty driver err=%d\n",
__FILE__,__LINE__,rc); __FILE__,__LINE__,rc);
unregister_pccard_driver(&dev_info); pcmcia_unregister_driver(&mgslpc_driver);
/* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) { while (dev_list != NULL) {
if (dev_list->state & DEV_CONFIG) if (dev_list->state & DEV_CONFIG)
mgslpc_release((u_long)dev_list); mgslpc_release((u_long)dev_list);
......
...@@ -470,26 +470,23 @@ int ide_event(event_t event, int priority, ...@@ -470,26 +470,23 @@ int ide_event(event_t event, int priority,
return 0; return 0;
} /* ide_event */ } /* ide_event */
/*====================================================================*/ static struct pcmcia_driver ide_cs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "ide_cs",
},
.attach = ide_attach,
.detach = ide_detach,
};
static int __init init_ide_cs(void) static int __init init_ide_cs(void)
{ {
servinfo_t serv; return pcmcia_register_driver(&ide_cs_driver);
DEBUG(0, "%s\n", version);
CardServices(GetCardServicesInfo, &serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "ide-cs: Card Services release "
"does not match!\n");
return -EINVAL;
}
register_pccard_driver(&dev_info, &ide_attach, &ide_detach);
return 0;
} }
static void __exit exit_ide_cs(void) static void __exit exit_ide_cs(void)
{ {
DEBUG(0, "ide-cs: unloading\n"); pcmcia_unregister_driver(&ide_cs_driver);
unregister_pccard_driver(&dev_info);
while (dev_list != NULL) while (dev_list != NULL)
ide_detach(dev_list); ide_detach(dev_list);
} }
......
...@@ -510,24 +510,25 @@ static int avmcs_event(event_t event, int priority, ...@@ -510,24 +510,25 @@ static int avmcs_event(event_t event, int priority,
return 0; return 0;
} /* avmcs_event */ } /* avmcs_event */
/*====================================================================*/ static struct pcmcia_driver avmcs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "avmcs_cs",
},
.attach = avmcs_attach,
.detach = avmcs_detach,
};
static int __init avmcs_init(void) static int __init avmcs_init(void)
{ {
servinfo_t serv; return pcmcia_register_driver(&avmcs_driver);
CardServices(GetCardServicesInfo, &serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "avm_cs: Card Services release "
"does not match!\n");
return -1;
}
register_pccard_driver(&dev_info, &avmcs_attach, &avmcs_detach);
return 0;
} }
static void __exit avmcs_exit(void) static void __exit avmcs_exit(void)
{ {
unregister_pccard_driver(&dev_info); pcmcia_unregister_driver(&avmcs_driver);
/* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) { while (dev_list != NULL) {
if (dev_list->state & DEV_CONFIG) if (dev_list->state & DEV_CONFIG)
avmcs_release((u_long)dev_list); avmcs_release((u_long)dev_list);
......
...@@ -515,30 +515,30 @@ static int avma1cs_event(event_t event, int priority, ...@@ -515,30 +515,30 @@ static int avma1cs_event(event_t event, int priority,
return 0; return 0;
} /* avma1cs_event */ } /* avma1cs_event */
/*====================================================================*/ static struct pcmcia_driver avma1cs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "avma1_cs",
},
.attach = avma1cs_attach,
.detach = avma1cs_detach,
};
static int __init init_avma1_cs(void) static int __init init_avma1_cs(void)
{ {
servinfo_t serv; return pcmcia_register_driver(&avma1cs_driver);
DEBUG(0, "%s\n", version);
CardServices(GetCardServicesInfo, &serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "avma1_cs: Card Services release "
"does not match!\n");
return -1;
}
register_pccard_driver(&dev_info, &avma1cs_attach, &avma1cs_detach);
return 0;
} }
static void __exit exit_avma1_cs(void) static void __exit exit_avma1_cs(void)
{ {
DEBUG(0, "avma1_cs: unloading\n"); pcmcia_unregister_driver(&avma1cs_driver);
unregister_pccard_driver(&dev_info);
while (dev_list != NULL) /* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) {
if (dev_list->state & DEV_CONFIG) if (dev_list->state & DEV_CONFIG)
avma1cs_release((u_long)dev_list); avma1cs_release((u_long)dev_list);
avma1cs_detach(dev_list); avma1cs_detach(dev_list);
}
} }
module_init(init_avma1_cs); module_init(init_avma1_cs);
......
...@@ -531,26 +531,25 @@ static int elsa_cs_event(event_t event, int priority, ...@@ -531,26 +531,25 @@ static int elsa_cs_event(event_t event, int priority,
return 0; return 0;
} /* elsa_cs_event */ } /* elsa_cs_event */
/*====================================================================*/ static struct pcmcia_driver elsa_cs_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "elsa_cs",
},
.attach = elsa_cs_attach,
.detach = elsa_cs_detach,
};
static int __init init_elsa_cs(void) static int __init init_elsa_cs(void)
{ {
servinfo_t serv; return pcmcia_register_driver(&elsa_cs_driver);
DEBUG(0, "%s\n", version);
CardServices(GetCardServicesInfo, &serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "elsa_cs: Card Services release "
"does not match!\n");
return -1;
}
register_pccard_driver(&dev_info, &elsa_cs_attach, &elsa_cs_detach);
return 0;
} }
static void __exit exit_elsa_cs(void) static void __exit exit_elsa_cs(void)
{ {
DEBUG(0, "elsa_cs: unloading\n"); pcmcia_unregister_driver(&elsa_cs_driver);
unregister_pccard_driver(&dev_info);
/* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) while (dev_list != NULL)
elsa_cs_detach(dev_list); elsa_cs_detach(dev_list);
} }
......
...@@ -633,26 +633,25 @@ static int sedlbauer_event(event_t event, int priority, ...@@ -633,26 +633,25 @@ static int sedlbauer_event(event_t event, int priority,
return 0; return 0;
} /* sedlbauer_event */ } /* sedlbauer_event */
/*====================================================================*/ static struct pcmcia_driver sedlbauer_driver = {
.owner = THIS_MODULE,
.drv = {
.name = "sedlbauer_cs",
},
.attach = sedlbauer_attach,
.detach = sedlbauer_detach,
};
static int __init init_sedlbauer_cs(void) static int __init init_sedlbauer_cs(void)
{ {
servinfo_t serv; return pcmcia_register_driver(&sedlbauer_driver);
DEBUG(0, "%s\n", version);
CardServices(GetCardServicesInfo, &serv);
if (serv.Revision != CS_RELEASE_CODE) {
printk(KERN_NOTICE "sedlbauer_cs: Card Services release "
"does not match!\n");
return -1;
}
register_pccard_driver(&dev_info, &sedlbauer_attach, &sedlbauer_detach);
return 0;
} }
static void __exit exit_sedlbauer_cs(void) static void __exit exit_sedlbauer_cs(void)
{ {
DEBUG(0, "sedlbauer_cs: unloading\n"); pcmcia_unregister_driver(&sedlbauer_driver);
unregister_pccard_driver(&dev_info);
/* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) { while (dev_list != NULL) {
del_timer(&dev_list->release); del_timer(&dev_list->release);
if (dev_list->state & DEV_CONFIG) if (dev_list->state & DEV_CONFIG)
...@@ -663,4 +662,3 @@ static void __exit exit_sedlbauer_cs(void) ...@@ -663,4 +662,3 @@ static void __exit exit_sedlbauer_cs(void)
module_init(init_sedlbauer_cs); module_init(init_sedlbauer_cs);
module_exit(exit_sedlbauer_cs); module_exit(exit_sedlbauer_cs);
# $Id: Config.in,v 1.74 2002/04/23 13:52:14 mag Exp $ # $Id: Kconfig,v 1.3 2003/05/28 11:02:23 dwmw2 Exp $
menu "Memory Technology Devices (MTD)" menu "Memory Technology Devices (MTD)"
...@@ -199,13 +199,28 @@ config NFTL ...@@ -199,13 +199,28 @@ config NFTL
not use it. not use it.
config NFTL_RW config NFTL_RW
bool "Write support for NFTL (BETA)" bool "Write support for NFTL"
depends on NFTL depends on NFTL
help help
If you're lucky, this will actually work. Don't whinge if it Support for writing to the NAND Flash Translation Layer, as used
doesn't. Send mail to the MTD mailing list on the DiskOnChip.
<linux-mtd@lists.infradead.org> if you want to help to make it more
reliable. config INFTL
tristate "INFTL (Inverse NAND Flash Translation Layer) support"
depends on MTD
---help---
This provides support for the Inverse NAND Flash Translation
Layer which is used on M-Systems' newer DiskOnChip devices. It
uses a kind of pseudo-file system on a flash device to emulate
a block device with 512-byte sectors, on top of which you put
a 'normal' file system.
You may find that the algorithms used in this code are patented
unless you live in the Free World where software patents aren't
legal - in the USA you are only permitted to use this on DiskOnChip
hardware, although under the terms of the GPL you're obviously
permitted to copy, modify and distribute the code as you wish. Just
not use it.
source "drivers/mtd/chips/Kconfig" source "drivers/mtd/chips/Kconfig"
......
# #
# Makefile for the memory technology device drivers. # Makefile for the memory technology device drivers.
# #
# Based on: # $Id: Makefile.common,v 1.2 2003/05/23 11:38:29 dwmw2 Exp $
# $Id: Makefile,v 1.66 2002/04/23 13:52:14 mag Exp $
obj-y += chips/ maps/ devices/ nand/
# *** BIG UGLY NOTE *** # *** BIG UGLY NOTE ***
# #
...@@ -27,14 +24,18 @@ obj-$(CONFIG_MTD) += mtdcore.o ...@@ -27,14 +24,18 @@ obj-$(CONFIG_MTD) += mtdcore.o
obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o obj-$(CONFIG_MTD_PARTITIONS) += mtdpart.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdline.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
# 'Users' - code which presents functionality to userspace. # 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o obj-$(CONFIG_MTD_CHAR) += mtdchar.o
obj-$(CONFIG_MTD_BLOCK) += mtdblock.o obj-$(CONFIG_MTD_BLOCK) += mtdblock.o mtd_blkdevs.o
obj-$(CONFIG_MTD_BLOCK_RO) += mtdblock_ro.o obj-$(CONFIG_MTD_BLOCK_RO) += mtdblock_ro.o mtd_blkdevs.o
obj-$(CONFIG_FTL) += ftl.o obj-$(CONFIG_FTL) += ftl.o mtd_blkdevs.o
obj-$(CONFIG_NFTL) += nftl.o obj-$(CONFIG_NFTL) += nftl.o mtd_blkdevs.o
obj-$(CONFIG_INFTL) += inftl.o mtd_blkdevs.o
nftl-objs := nftlcore.o nftlmount.o nftl-objs := nftlcore.o nftlmount.o
inftl-objs := inftlcore.o inftlmount.o
obj-y += chips/ maps/ devices/ nand/
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
This is access code for flashes using ARM's flash partitioning This is access code for flashes using ARM's flash partitioning
standards. standards.
$Id: afs.c,v 1.8 2002/05/04 08:49:09 rmk Exp $ $Id: afs.c,v 1.11 2003/05/16 17:08:24 dwmw2 Exp $
======================================================================*/ ======================================================================*/
...@@ -125,7 +125,9 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr) ...@@ -125,7 +125,9 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr)
return ret; return ret;
} }
int parse_afs_partitions(struct mtd_info *mtd, struct mtd_partition **pparts) static int parse_afs_partitions(struct mtd_info *mtd,
struct mtd_partition **pparts,
unsigned long origin)
{ {
struct mtd_partition *parts; struct mtd_partition *parts;
u_int mask, off, idx, sz; u_int mask, off, idx, sz;
...@@ -227,7 +229,25 @@ int parse_afs_partitions(struct mtd_info *mtd, struct mtd_partition **pparts) ...@@ -227,7 +229,25 @@ int parse_afs_partitions(struct mtd_info *mtd, struct mtd_partition **pparts)
return idx ? idx : ret; return idx ? idx : ret;
} }
EXPORT_SYMBOL(parse_afs_partitions); static struct mtd_part_parser afs_parser = {
.owner = THIS_MODULE,
.parse_fn = parse_afs_partitions,
.name = "afs",
};
static int __init afs_parser_init(void)
{
return register_mtd_parser(&afs_parser);
}
static void __exit afs_parser_exit(void)
{
deregister_mtd_parser(&afs_parser);
}
module_init(afs_parser_init);
module_exit(afs_parser_exit);
MODULE_AUTHOR("ARM Ltd"); MODULE_AUTHOR("ARM Ltd");
MODULE_DESCRIPTION("ARM Firmware Suite partition parser"); MODULE_DESCRIPTION("ARM Firmware Suite partition parser");
......
# drivers/mtd/chips/Config.in # drivers/mtd/chips/Kconfig
# $Id: Config.in,v 1.12 2001/09/23 15:35:21 dwmw2 Exp $ # $Id: Kconfig,v 1.3 2003/05/28 15:13:24 dwmw2 Exp $
menu "RAM/ROM/Flash chip drivers" menu "RAM/ROM/Flash chip drivers"
depends on MTD!=n depends on MTD!=n
...@@ -15,7 +15,6 @@ config MTD_CFI ...@@ -15,7 +15,6 @@ config MTD_CFI
option. Visit <http://www.amd.com/products/nvd/overview/cfi.html> option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
for more information on CFI. for more information on CFI.
#dep_tristate ' Detect non-CFI Intel-compatible flash chips' CONFIG_MTD_INTELPROBE $CONFIG_MTD
config MTD_JEDECPROBE config MTD_JEDECPROBE
tristate "Detect non-CFI AMD/JEDEC-compatible flash chips" tristate "Detect non-CFI AMD/JEDEC-compatible flash chips"
depends on MTD depends on MTD
...@@ -107,6 +106,13 @@ config MTD_CFI_B4 ...@@ -107,6 +106,13 @@ config MTD_CFI_B4
If you wish to support CFI devices on a physical bus which is If you wish to support CFI devices on a physical bus which is
32 bits wide, say 'Y'. 32 bits wide, say 'Y'.
config MTD_CFI_B8
bool "Support 64-bit buswidth"
depends on MTD_CFI_GEOMETRY
help
If you wish to support CFI devices on a physical bus which is
64 bits wide, say 'Y'.
config MTD_CFI_I1 config MTD_CFI_I1
bool "Support 1-chip flash interleave" if !MTD_CFI_B1 bool "Support 1-chip flash interleave" if !MTD_CFI_B1
depends on MTD_CFI_GEOMETRY depends on MTD_CFI_GEOMETRY
...@@ -129,6 +135,13 @@ config MTD_CFI_I4 ...@@ -129,6 +135,13 @@ config MTD_CFI_I4
If your flash chips are interleaved in fours - i.e. you have four If your flash chips are interleaved in fours - i.e. you have four
flash chips addressed by each bus cycle, then say 'Y'. flash chips addressed by each bus cycle, then say 'Y'.
config MTD_CFI_I8
bool "Support 8-chip flash interleave"
depends on MTD_CFI_GEOMETRY
help
If your flash chips are interleaved in eights - i.e. you have eight
flash chips addressed by each bus cycle, then say 'Y'.
config MTD_CFI_INTELEXT config MTD_CFI_INTELEXT
tristate "Support for Intel/Sharp flash chips" tristate "Support for Intel/Sharp flash chips"
depends on MTD_GEN_PROBE depends on MTD_GEN_PROBE
...@@ -145,7 +158,15 @@ config MTD_CFI_AMDSTD ...@@ -145,7 +158,15 @@ config MTD_CFI_AMDSTD
The Common Flash Interface defines a number of different command The Common Flash Interface defines a number of different command
sets which a CFI-compliant chip may claim to implement. This code sets which a CFI-compliant chip may claim to implement. This code
provides support for one of those command sets, used on chips provides support for one of those command sets, used on chips
chips including the AMD Am29LV320. including the AMD Am29LV320.
config MTD_CFI_STAA
tristate "Support for ST (Advanced Architecture) flash chips"
depends on MTD_GEN_PROBE
help
The Common Flash Interface defines a number of different command
sets which a CFI-compliant chip may claim to implement. This code
provides support for one of those command sets.
config MTD_RAM config MTD_RAM
tristate "Support for RAM chips in bus mapping" tristate "Support for RAM chips in bus mapping"
...@@ -177,10 +198,10 @@ config MTD_OBSOLETE_CHIPS ...@@ -177,10 +198,10 @@ config MTD_OBSOLETE_CHIPS
help help
This option does not enable any code directly, but will allow you to This option does not enable any code directly, but will allow you to
select some other chip drivers which are now considered obsolete, select some other chip drivers which are now considered obsolete,
because the generic CONFIG_JEDEC_PROBE code above should now detect because the generic CONFIG_JEDECPROBE code above should now detect
the chips which are supported by these drivers, and allow the generic the chips which are supported by these drivers, and allow the generic
CFI-compatible drivers to drive the chips. Say 'N' here unless you have CFI-compatible drivers to drive the chips. Say 'N' here unless you have
already tried the CONFIG_JEDEC_PROBE method and reported its failure already tried the CONFIG_JEDECPROBE method and reported its failure
to the MTD mailing list at <linux-mtd@lists.infradead.org> to the MTD mailing list at <linux-mtd@lists.infradead.org>
config MTD_AMDSTD config MTD_AMDSTD
...@@ -209,8 +230,7 @@ config MTD_JEDEC ...@@ -209,8 +230,7 @@ config MTD_JEDEC
programming flash. It is commonly used in older AMD chips. It is programming flash. It is commonly used in older AMD chips. It is
only called JEDEC because the JEDEC association only called JEDEC because the JEDEC association
<http://www.jedec.org/> distributes the identification codes for the <http://www.jedec.org/> distributes the identification codes for the
chips. WARNING!!!! This code does not compile and is incomplete as chips.
are the specific JEDEC devices drivers.
endmenu endmenu
# #
# linux/drivers/chips/Makefile # linux/drivers/chips/Makefile
# #
# $Id: Makefile,v 1.7 2001/10/05 06:53:51 dwmw2 Exp $ # $Id: Makefile.common,v 1.1 2003/05/21 15:00:01 dwmw2 Exp $
# *** BIG UGLY NOTE *** # *** BIG UGLY NOTE ***
# #
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
obj-$(CONFIG_MTD) += chipreg.o obj-$(CONFIG_MTD) += chipreg.o
obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o
obj-$(CONFIG_MTD_CFI) += cfi_probe.o obj-$(CONFIG_MTD_CFI) += cfi_probe.o
obj-$(CONFIG_MTD_CFI_STAA) += cfi_cmdset_0020.o
obj-$(CONFIG_MTD_CFI_AMDSTD) += cfi_cmdset_0002.o obj-$(CONFIG_MTD_CFI_AMDSTD) += cfi_cmdset_0002.o
obj-$(CONFIG_MTD_CFI_INTELEXT) += cfi_cmdset_0001.o obj-$(CONFIG_MTD_CFI_INTELEXT) += cfi_cmdset_0001.o
obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o
obj-$(CONFIG_MTD_INTELPROBE) += intel_probe.o
obj-$(CONFIG_MTD_JEDEC) += jedec.o obj-$(CONFIG_MTD_JEDEC) += jedec.o
obj-$(CONFIG_MTD_JEDECPROBE) += jedec_probe.o obj-$(CONFIG_MTD_JEDECPROBE) += jedec_probe.o
obj-$(CONFIG_MTD_RAM) += map_ram.o obj-$(CONFIG_MTD_RAM) += map_ram.o
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Author: Jonas Holmberg <jonas.holmberg@axis.com> * Author: Jonas Holmberg <jonas.holmberg@axis.com>
* *
* $Id: amd_flash.c,v 1.15 2001/10/02 15:05:11 dwmw2 Exp $ * $Id: amd_flash.c,v 1.22 2003/05/28 13:47:19 dwmw2 Exp $
* *
* Copyright (c) 2001 Axis Communications AB * Copyright (c) 2001 Axis Communications AB
* *
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
/* Manufacturers */ /* Manufacturers */
#define MANUFACTURER_AMD 0x0001 #define MANUFACTURER_AMD 0x0001
#define MANUFACTURER_ATMEL 0x001F
#define MANUFACTURER_FUJITSU 0x0004 #define MANUFACTURER_FUJITSU 0x0004
#define MANUFACTURER_ST 0x0020 #define MANUFACTURER_ST 0x0020
#define MANUFACTURER_SST 0x00BF #define MANUFACTURER_SST 0x00BF
...@@ -67,10 +68,14 @@ ...@@ -67,10 +68,14 @@
#define AM29BDS323D 0x22D1 #define AM29BDS323D 0x22D1
#define AM29BDS643D 0x227E #define AM29BDS643D 0x227E
/* Atmel */
#define AT49xV16x 0x00C0
#define AT49xV16xT 0x00C2
/* Fujitsu */ /* Fujitsu */
#define MBM29LV160TE 0x22C4 #define MBM29LV160TE 0x22C4
#define MBM29LV160BE 0x2249 #define MBM29LV160BE 0x2249
#define MBM29LV800BB 0x225B
/* ST - www.st.com */ /* ST - www.st.com */
#define M29W800T 0x00D7 #define M29W800T 0x00D7
...@@ -135,11 +140,11 @@ static const char im_name[] = "amd_flash"; ...@@ -135,11 +140,11 @@ static const char im_name[] = "amd_flash";
static inline __u32 wide_read(struct map_info *map, __u32 addr) static inline __u32 wide_read(struct map_info *map, __u32 addr)
{ {
if (map->buswidth == 1) { if (map->buswidth == 1) {
return map->read8(map, addr); return map_read8(map, addr);
} else if (map->buswidth == 2) { } else if (map->buswidth == 2) {
return map->read16(map, addr); return map_read16(map, addr);
} else if (map->buswidth == 4) { } else if (map->buswidth == 4) {
return map->read32(map, addr); return map_read32(map, addr);
} }
return 0; return 0;
...@@ -148,11 +153,11 @@ static inline __u32 wide_read(struct map_info *map, __u32 addr) ...@@ -148,11 +153,11 @@ static inline __u32 wide_read(struct map_info *map, __u32 addr)
static inline void wide_write(struct map_info *map, __u32 val, __u32 addr) static inline void wide_write(struct map_info *map, __u32 val, __u32 addr)
{ {
if (map->buswidth == 1) { if (map->buswidth == 1) {
map->write8(map, val, addr); map_write8(map, val, addr);
} else if (map->buswidth == 2) { } else if (map->buswidth == 2) {
map->write16(map, val, addr); map_write16(map, val, addr);
} else if (map->buswidth == 4) { } else if (map->buswidth == 4) {
map->write32(map, val, addr); map_write32(map, val, addr);
} }
} }
...@@ -419,10 +424,7 @@ static int probe_new_chip(struct mtd_info *mtd, __u32 base, ...@@ -419,10 +424,7 @@ static int probe_new_chip(struct mtd_info *mtd, __u32 base,
static struct mtd_info *amd_flash_probe(struct map_info *map) static struct mtd_info *amd_flash_probe(struct map_info *map)
{ {
/* Keep this table on the stack so that it gets deallocated after the static const struct amd_flash_info table[] = {
* probe is done.
*/
const struct amd_flash_info table[] = {
{ {
.mfr_id = MANUFACTURER_AMD, .mfr_id = MANUFACTURER_AMD,
.dev_id = AM29LV160DT, .dev_id = AM29LV160DT,
...@@ -555,6 +557,18 @@ static struct mtd_info *amd_flash_probe(struct map_info *map) ...@@ -555,6 +557,18 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
{ .offset = 0x0F8000, .erasesize = 0x02000, .numblocks = 2 }, { .offset = 0x0F8000, .erasesize = 0x02000, .numblocks = 2 },
{ .offset = 0x0FC000, .erasesize = 0x04000, .numblocks = 1 } { .offset = 0x0FC000, .erasesize = 0x04000, .numblocks = 1 }
} }
}, {
.mfr_id = MANUFACTURER_FUJITSU,
.dev_id = MBM29LV800BB,
.name = "Fujitsu MBM29LV800BB",
.size = 0x00100000,
.numeraseregions = 4,
.regions = {
{ .offset = 0x000000, .erasesize = 0x04000, .numblocks = 1 },
{ .offset = 0x004000, .erasesize = 0x02000, .numblocks = 2 },
{ .offset = 0x008000, .erasesize = 0x08000, .numblocks = 1 },
{ .offset = 0x010000, .erasesize = 0x10000, .numblocks = 15 }
}
}, { }, {
.mfr_id = MANUFACTURER_ST, .mfr_id = MANUFACTURER_ST,
.dev_id = M29W800T, .dev_id = M29W800T,
...@@ -613,6 +627,26 @@ static struct mtd_info *amd_flash_probe(struct map_info *map) ...@@ -613,6 +627,26 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
{ .offset = 0x600000, .erasesize = 0x10000, .numblocks = 31 }, { .offset = 0x600000, .erasesize = 0x10000, .numblocks = 31 },
{ .offset = 0x7f0000, .erasesize = 0x02000, .numblocks = 8 }, { .offset = 0x7f0000, .erasesize = 0x02000, .numblocks = 8 },
} }
}, {
.mfr_id = MANUFACTURER_ATMEL,
.dev_id = AT49xV16x,
.name = "Atmel AT49xV16x",
.size = 0x00200000,
.numeraseregions = 2,
.regions = {
{ .offset = 0x000000, .erasesize = 0x02000, .numblocks = 8 },
{ .offset = 0x010000, .erasesize = 0x10000, .numblocks = 31 }
}
}, {
.mfr_id = MANUFACTURER_ATMEL,
.dev_id = AT49xV16xT,
.name = "Atmel AT49xV16xT",
.size = 0x00200000,
.numeraseregions = 2,
.regions = {
{ .offset = 0x000000, .erasesize = 0x10000, .numblocks = 31 },
{ .offset = 0x1F0000, .erasesize = 0x02000, .numblocks = 8 }
}
} }
}; };
...@@ -785,7 +819,7 @@ static inline int read_one_chip(struct map_info *map, struct flchip *chip, ...@@ -785,7 +819,7 @@ static inline int read_one_chip(struct map_info *map, struct flchip *chip,
chip->state = FL_READY; chip->state = FL_READY;
map->copy_from(map, buf, adr, len); map_copy_from(map, buf, adr, len);
wake_up(&chip->wq); wake_up(&chip->wq);
spin_unlock_bh(chip->mutex); spin_unlock_bh(chip->mutex);
...@@ -947,7 +981,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len, ...@@ -947,7 +981,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len,
u_char tmp_buf[4]; u_char tmp_buf[4];
__u32 datum; __u32 datum;
map->copy_from(map, tmp_buf, map_copy_from(map, tmp_buf,
bus_ofs + private->chips[chipnum].start, bus_ofs + private->chips[chipnum].start,
map->buswidth); map->buswidth);
while (len && i < map->buswidth) while (len && i < map->buswidth)
...@@ -1020,7 +1054,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len, ...@@ -1020,7 +1054,7 @@ static int amd_flash_write(struct mtd_info *mtd, loff_t to , size_t len,
u_char tmp_buf[2]; u_char tmp_buf[2];
__u32 datum; __u32 datum;
map->copy_from(map, tmp_buf, map_copy_from(map, tmp_buf,
ofs + private->chips[chipnum].start, ofs + private->chips[chipnum].start,
map->buswidth); map->buswidth);
while (len--) { while (len--) {
...@@ -1141,7 +1175,7 @@ static inline int erase_one_block(struct map_info *map, struct flchip *chip, ...@@ -1141,7 +1175,7 @@ static inline int erase_one_block(struct map_info *map, struct flchip *chip,
__u8 verify; __u8 verify;
for (address = adr; address < (adr + size); address++) { for (address = adr; address < (adr + size); address++) {
if ((verify = map->read8(map, address)) != 0xFF) { if ((verify = map_read8(map, address)) != 0xFF) {
error = 1; error = 1;
break; break;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/* /*
* Common code to handle absent "placeholder" devices * Common code to handle absent "placeholder" devices
* Copyright 2001 Resilience Corporation <ebrower@resilience.com> * Copyright 2001 Resilience Corporation <ebrower@resilience.com>
* $Id: map_absent.c,v 1.2 2001/10/02 15:05:12 dwmw2 Exp $ * $Id: map_absent.c,v 1.4 2003/05/28 12:51:49 dwmw2 Exp $
* *
* This map driver is used to allocate "placeholder" MTD * This map driver is used to allocate "placeholder" MTD
* devices on systems that have socketed/removable media. * devices on systems that have socketed/removable media.
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/init.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <linux/mtd/compatmac.h>
static int map_absent_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int map_absent_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int map_absent_write (struct mtd_info *, loff_t, size_t, size_t *, const u_char *); static int map_absent_write (struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
...@@ -65,7 +66,7 @@ static struct mtd_info *map_absent_probe(struct map_info *map) ...@@ -65,7 +66,7 @@ static struct mtd_info *map_absent_probe(struct map_info *map)
mtd->flags = 0; mtd->flags = 0;
mtd->erasesize = PAGE_SIZE; mtd->erasesize = PAGE_SIZE;
MOD_INC_USE_COUNT; __module_get(THIS_MODULE);
return mtd; return mtd;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment