mtd: remove redwood map driver

Removing the redwood mtd mapping driver, because all REDWOOD_[456]
configuration options were removed from the kernel, because they weren't
referenced anywhere.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index f22bc9f05ddbf23822cdc4823cace54138d7dcd3..701d942c679576492fcc7fea463a317f2e7863e5 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -319,14 +319,6 @@ config MTD_CFI_FLAGADM
          Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
 
-config MTD_REDWOOD
-       tristate "CFI Flash devices mapped on IBM Redwood"
-       depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 )
-       help
-         This enables access routines for the flash chips on the IBM
-         Redwood board. If you have one of these boards and would like to
-         use the flash chips on it, say 'Y'.
-
 config MTD_SOLUTIONENGINE
        tristate "CFI Flash device mapped on Hitachi SolutionEngine"
        depends on SUPERH && SOLUTION_ENGINE && MTD_CFI && MTD_REDBOOT_PARTS

diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index bb035cd54c72e6fb0a5f2dcb867443bc5a78c464..f216bb573713a4edc99e7dbecb121541da76eb2b 100644 (file)
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -44,7 +44,6 @@ obj-$(CONFIG_MTD_AUTCPU12)    += autcpu12-nvram.o
 obj-$(CONFIG_MTD_EDB7312)      += edb7312.o
 obj-$(CONFIG_MTD_IMPA7)                += impa7.o
 obj-$(CONFIG_MTD_FORTUNET)     += fortunet.o
-obj-$(CONFIG_MTD_REDWOOD)      += redwood.o
 obj-$(CONFIG_MTD_UCLINUX)      += uclinux.o
 obj-$(CONFIG_MTD_NETtel)       += nettel.o
 obj-$(CONFIG_MTD_SCB2_FLASH)   += scb2_flash.o

diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c
deleted file mode 100644 (file)
index 933c0b6..0000000
--- a/drivers/mtd/maps/redwood.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * drivers/mtd/maps/redwood.c
- *
- * FLASH map for the IBM Redwood 4/5/6 boards.
- *
- * Author: MontaVista Software, Inc. <source@mvista.com>
- *
- * 2001-2003 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#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>
-
-#if !defined (CONFIG_REDWOOD_6)
-
-#define WINDOW_ADDR 0xffc00000
-#define WINDOW_SIZE 0x00400000
-
-#define RW_PART0_OF    0
-#define RW_PART0_SZ    0x10000
-#define RW_PART1_OF    RW_PART0_SZ
-#define RW_PART1_SZ    0x200000 - 0x10000
-#define RW_PART2_OF    0x200000
-#define RW_PART2_SZ    0x10000
-#define RW_PART3_OF    0x210000
-#define RW_PART3_SZ    0x200000 - (0x10000 + 0x20000)
-#define RW_PART4_OF    0x3e0000
-#define RW_PART4_SZ    0x20000
-
-static struct mtd_partition redwood_flash_partitions[] = {
-       {
-               .name = "Redwood OpenBIOS Vital Product Data",
-               .offset = RW_PART0_OF,
-               .size = RW_PART0_SZ,
-               .mask_flags = MTD_WRITEABLE     /* force read-only */
-       },
-       {
-               .name = "Redwood kernel",
-               .offset = RW_PART1_OF,
-               .size = RW_PART1_SZ
-       },
-       {
-               .name = "Redwood OpenBIOS non-volatile storage",
-               .offset = RW_PART2_OF,
-               .size = RW_PART2_SZ,
-               .mask_flags = MTD_WRITEABLE     /* force read-only */
-       },
-       {
-               .name = "Redwood filesystem",
-               .offset = RW_PART3_OF,
-               .size = RW_PART3_SZ
-       },
-       {
-               .name = "Redwood OpenBIOS",
-               .offset = RW_PART4_OF,
-               .size = RW_PART4_SZ,
-               .mask_flags = MTD_WRITEABLE     /* force read-only */
-       }
-};
-
-#else /* CONFIG_REDWOOD_6 */
-/* FIXME: the window is bigger - armin */
-#define WINDOW_ADDR 0xff800000
-#define WINDOW_SIZE 0x00800000
-
-#define RW_PART0_OF    0
-#define RW_PART0_SZ    0x400000        /* 4 MiB data */
-#define RW_PART1_OF    RW_PART0_OF + RW_PART0_SZ
-#define RW_PART1_SZ    0x10000         /* 64K VPD */
-#define RW_PART2_OF    RW_PART1_OF + RW_PART1_SZ
-#define RW_PART2_SZ    0x400000 - (0x10000 + 0x20000)
-#define RW_PART3_OF    RW_PART2_OF + RW_PART2_SZ
-#define RW_PART3_SZ    0x20000
-
-static struct mtd_partition redwood_flash_partitions[] = {
-       {
-               .name = "Redwood filesystem",
-               .offset = RW_PART0_OF,
-               .size = RW_PART0_SZ
-       },
-       {
-               .name = "Redwood OpenBIOS Vital Product Data",
-               .offset = RW_PART1_OF,
-               .size = RW_PART1_SZ,
-               .mask_flags = MTD_WRITEABLE     /* force read-only */
-       },
-       {
-               .name = "Redwood kernel",
-               .offset = RW_PART2_OF,
-               .size = RW_PART2_SZ
-       },
-       {
-               .name = "Redwood OpenBIOS",
-               .offset = RW_PART3_OF,
-               .size = RW_PART3_SZ,
-               .mask_flags = MTD_WRITEABLE     /* force read-only */
-       }
-};
-
-#endif /* CONFIG_REDWOOD_6 */
-
-struct map_info redwood_flash_map = {
-       .name = "IBM Redwood",
-       .size = WINDOW_SIZE,
-       .bankwidth = 2,
-       .phys = WINDOW_ADDR,
-};
-
-
-#define NUM_REDWOOD_FLASH_PARTITIONS ARRAY_SIZE(redwood_flash_partitions)
-
-static struct mtd_info *redwood_mtd;
-
-static int __init init_redwood_flash(void)
-{
-       int err;
-
-       printk(KERN_NOTICE "redwood: flash mapping: %x at %x\n",
-                       WINDOW_SIZE, WINDOW_ADDR);
-
-       redwood_flash_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
-
-       if (!redwood_flash_map.virt) {
-               printk("init_redwood_flash: failed to ioremap\n");
-               return -EIO;
-       }
-       simple_map_init(&redwood_flash_map);
-
-       redwood_mtd = do_map_probe("cfi_probe",&redwood_flash_map);
-
-       if (redwood_mtd) {
-               redwood_mtd->owner = THIS_MODULE;
-               err = add_mtd_partitions(redwood_mtd,
-                               redwood_flash_partitions,
-                               NUM_REDWOOD_FLASH_PARTITIONS);
-               if (err) {
-                       printk("init_redwood_flash: add_mtd_partitions failed\n");
-                       iounmap(redwood_flash_map.virt);
-               }
-               return err;
-
-       }
-
-       iounmap(redwood_flash_map.virt);
-       return -ENXIO;
-}
-
-static void __exit cleanup_redwood_flash(void)
-{
-       if (redwood_mtd) {
-               del_mtd_partitions(redwood_mtd);
-               /* moved iounmap after map_destroy - armin */
-               map_destroy(redwood_mtd);
-               iounmap((void *)redwood_flash_map.virt);
-       }
-}
-
-module_init(init_redwood_flash);
-module_exit(cleanup_redwood_flash);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("MontaVista Software <source@mvista.com>");
-MODULE_DESCRIPTION("MTD map driver for the IBM Redwood reference boards");