Commit 65d95fbb authored by David Woodhouse's avatar David Woodhouse

Final cleanups for MTD merge.

parent 5af017c0
# drivers/mtd/chips/Kconfig # drivers/mtd/chips/Kconfig
# $Id: Kconfig,v 1.2 2003/05/28 10:59:06 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
...@@ -106,6 +106,13 @@ config MTD_CFI_B4 ...@@ -106,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
...@@ -128,6 +135,13 @@ config MTD_CFI_I4 ...@@ -128,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
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright 2000,2001 David A. Schleef <ds@schleef.org> * Copyright 2000,2001 David A. Schleef <ds@schleef.org>
* 2000,2001 Lineo, Inc. * 2000,2001 Lineo, Inc.
* *
* $Id: sharp.c,v 1.11 2003/05/28 12:51:49 dwmw2 Exp $ * $Id: sharp.c,v 1.12 2003/05/28 15:39:52 dwmw2 Exp $
* *
* Devices supported: * Devices supported:
* LH28F016SCT Symmetrical block flash memory, 2Mx8 * LH28F016SCT Symmetrical block flash memory, 2Mx8
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/cfi.h> #include <linux/mtd/cfi.h>
#include <linux/delay.h> #include <linux/delay.h>
......
# drivers/mtd/maps/Kconfig # drivers/mtd/maps/Kconfig
# $Id: Kconfig,v 1.3 2003/05/28 10:54:23 dwmw2 Exp $ # $Id: Kconfig,v 1.4 2003/05/28 15:18:54 dwmw2 Exp $
menu "Self-contained MTD device drivers" menu "Self-contained MTD device drivers"
depends on MTD!=n depends on MTD!=n
...@@ -148,20 +148,16 @@ config MTD_DOC2001 ...@@ -148,20 +148,16 @@ config MTD_DOC2001
chips. chips.
config MTD_DOC2001PLUS config MTD_DOC2001PLUS
tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (see help)" tristate "M-Systems Disk-On-Chip Millennium Plus"
depends on MTD depends on MTD
---help--- ---help---
This provides an alternative MTD device driver for the M-Systems This provides an MTD device driver for the M-Systems DiskOnChip
DiskOnChip Millennium devices. Use this if you have problems with Millennium Plus devices.
the combined DiskOnChip 2000 and Millennium driver above. To get
the DiskOnChip probe code to load and use this driver instead of
the other one, you will need to undefine DOC_SINGLE_DRIVER near
the beginning of <file:drivers/mtd/devices/docprobe.c>.
If you use this device, you probably also want to enable the NFTL If you use this device, you probably also want to enable the INFTL
'NAND Flash Translation Layer' option below, which is used to 'Inverse NAND Flash Translation Layer' option below, which is used
emulate a block device by using a kind of file system on the flash to emulate a block device by using a kind of file system on the
chips. flash chips.
config MTD_DOCPROBE config MTD_DOCPROBE
tristate tristate
......
# drivers/mtd/maps/Kconfig # drivers/mtd/maps/Kconfig
# $Id: Kconfig,v 1.10 2003/05/28 11:34:44 dwmw2 Exp $ # $Id: Kconfig,v 1.11 2003/05/28 15:16:56 dwmw2 Exp $
menu "Mapping drivers for chip access" menu "Mapping drivers for chip access"
depends on MTD!=n depends on MTD!=n
...@@ -458,7 +458,7 @@ config MTD_H720X ...@@ -458,7 +458,7 @@ config MTD_H720X
# This needs CFI or JEDEC, depending on the cards found. # This needs CFI or JEDEC, depending on the cards found.
config MTD_PCI config MTD_PCI
tristate "PCI MTD driver" tristate "PCI MTD driver"
depends on MTD && PCI depends on MTD && PCI && MTD_COMPLEX_MAPPINGS
help help
Mapping for accessing flash devices on add-in cards like the Intel XScale Mapping for accessing flash devices on add-in cards like the Intel XScale
IQ80310 card, and the Intel EBSA285 card in blank ROM programming mode IQ80310 card, and the Intel EBSA285 card in blank ROM programming mode
...@@ -468,7 +468,7 @@ config MTD_PCI ...@@ -468,7 +468,7 @@ config MTD_PCI
config MTD_PCMCIA config MTD_PCMCIA
tristate "PCMCIA MTD driver" tristate "PCMCIA MTD driver"
depends on MTD && PCMCIA depends on MTD && PCMCIA && MTD_COMPLEX_MAPPINGS
help help
Map driver for accessing PCMCIA linear flash memory cards. These Map driver for accessing PCMCIA linear flash memory cards. These
cards are usually around 4-16MiB in size. This does not include cards are usually around 4-16MiB in size. This does not include
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* amd76xrom.c * amd76xrom.c
* *
* Normal mappings of chips in physical memory * Normal mappings of chips in physical memory
* $Id: amd76xrom.c,v 1.7 2003/05/21 12:45:17 dwmw2 Exp $ * $Id: amd76xrom.c,v 1.8 2003/05/28 15:44:28 dwmw2 Exp $
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -102,7 +102,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev, ...@@ -102,7 +102,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
if (rom_size > window->size) { if (rom_size > window->size) {
continue; continue;
} }
info->map.phys = window->start + window->size - rom_size info->map.phys = window->start + window->size - rom_size;
info->map.virt = info->map.virt =
info->window_addr + window->size - rom_size; info->window_addr + window->size - rom_size;
info->map.size = rom_size; info->map.size = rom_size;
......
...@@ -59,6 +59,7 @@ static struct mtd_partition physmap_partitions[] = { ...@@ -59,6 +59,7 @@ static struct mtd_partition physmap_partitions[] = {
}; };
#define NUM_PARTITIONS (sizeof(physmap_partitions)/sizeof(struct mtd_partition)) #define NUM_PARTITIONS (sizeof(physmap_partitions)/sizeof(struct mtd_partition))
const char *part_probes = {"cmdlinepart", "RedBoot", NULL};
#endif /* CONFIG_MTD_PARTITIONS */ #endif /* CONFIG_MTD_PARTITIONS */
...@@ -86,7 +87,7 @@ int __init init_physmap(void) ...@@ -86,7 +87,7 @@ int __init init_physmap(void)
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
mtd_parts_nb = parse_mtd_partitions(mymtd, probes, mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,
&mtd_parts, 0); &mtd_parts, 0);
if (mtd_parts_nb > 0) if (mtd_parts_nb > 0)
...@@ -120,7 +121,7 @@ static void __exit cleanup_physmap(void) ...@@ -120,7 +121,7 @@ static void __exit cleanup_physmap(void)
del_mtd_partitions(mymtd); del_mtd_partitions(mymtd);
kfree(mtd_parts); kfree(mtd_parts);
} else if (NUM_PARTITIONS) { } else if (NUM_PARTITIONS) {
del_mtd_partions(mymtd); del_mtd_partitions(mymtd);
} else { } else {
del_mtd_device(mymtd); del_mtd_device(mymtd);
} }
......
/* Common Flash Interface structures /* Common Flash Interface structures
* See http://support.intel.com/design/flash/technote/index.htm * See http://support.intel.com/design/flash/technote/index.htm
* $Id: cfi.h,v 1.34 2003/05/16 18:55:44 dwmw2 Exp $ * $Id: cfi.h,v 1.35 2003/05/28 15:37:32 dwmw2 Exp $
*/ */
#ifndef __MTD_CFI_H__ #ifndef __MTD_CFI_H__
#define __MTD_CFI_H__ #define __MTD_CFI_H__
#include <linux/config.h> #include <linux/config.h>
#include <linux/version.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
......
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