mtd: remove the dbox2-flash map driver (e6828b1b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/mtd/maps/Kconfig

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -302,14 +302,6 @@ config MTD_MBX860
	MBX860 board. If you have one of these boards and would like		MBX860 board. If you have one of these boards and would like
	to use the flash chips on it, say 'Y'.		to use the flash chips on it, say 'Y'.

	config MTD_DBOX2
	tristate "CFI Flash device mapped on D-Box2"
	depends on DBOX2 && MTD_CFI_INTELSTD && MTD_CFI_INTELEXT && MTD_CFI_AMDSTD
	help
	This enables access routines for the flash chips on the Nokia/Sagem
	D-Box 2 board. If you have one of these boards and would like to use
	the flash chips on it, say 'Y'.

	config MTD_CFI_FLAGADM		config MTD_CFI_FLAGADM
	tristate "CFI Flash device mapping on FlagaDM"		tristate "CFI Flash device mapping on FlagaDM"
	depends on 8xx && MTD_CFI		depends on 8xx && MTD_CFI

drivers/mtd/maps/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@ obj-$(CONFIG_MTD_TS5500) += ts5500_flash.o
	obj-$(CONFIG_MTD_SUN_UFLASH) += sun_uflash.o		obj-$(CONFIG_MTD_SUN_UFLASH) += sun_uflash.o
	obj-$(CONFIG_MTD_VMAX) += vmax301.o		obj-$(CONFIG_MTD_VMAX) += vmax301.o
	obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx200_docflash.o		obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx200_docflash.o
	obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.o
	obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o		obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
	obj-$(CONFIG_MTD_PCI) += pci.o		obj-$(CONFIG_MTD_PCI) += pci.o
	obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o		obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o

drivers/mtd/maps/dbox2-flash.c

deleted100644 → 0

+0 −123

Original line number	Original line	Diff line number	Diff line
	/*
	* D-Box 2 flash driver
	*/

	#include <linux/module.h>
	#include <linux/types.h>
	#include <linux/kernel.h>
	#include <linux/init.h>
	#include <asm/io.h>
	#include <linux/mtd/mtd.h>
	#include <linux/mtd/map.h>
	#include <linux/mtd/partitions.h>
	#include <linux/errno.h>

	/* partition_info gives details on the logical partitions that the split the
	* single flash device into. If the size if zero we use up to the end of the
	* device. */
	static struct mtd_partition partition_info[]= {
	{
	.name = "BR bootloader",
	.size = 128 * 1024,
	.offset = 0,
	.mask_flags = MTD_WRITEABLE
	},
	{
	.name = "FLFS (U-Boot)",
	.size = 128 * 1024,
	.offset = MTDPART_OFS_APPEND,
	.mask_flags = 0
	},
	{
	.name = "Root (SquashFS)",
	.size = 7040 * 1024,
	.offset = MTDPART_OFS_APPEND,
	.mask_flags = 0
	},
	{
	.name = "var (JFFS2)",
	.size = 896 * 1024,
	.offset = MTDPART_OFS_APPEND,
	.mask_flags = 0
	},
	{
	.name = "Flash without bootloader",
	.size = MTDPART_SIZ_FULL,
	.offset = 128 * 1024,
	.mask_flags = 0
	},
	{
	.name = "Complete Flash",
	.size = MTDPART_SIZ_FULL,
	.offset = 0,
	.mask_flags = MTD_WRITEABLE
	}
	};

	#define NUM_PARTITIONS ARRAY_SIZE(partition_info)

	#define WINDOW_ADDR 0x10000000
	#define WINDOW_SIZE 0x800000

	static struct mtd_info *mymtd;


	struct map_info dbox2_flash_map = {
	.name = "D-Box 2 flash memory",
	.size = WINDOW_SIZE,
	.bankwidth = 4,
	.phys = WINDOW_ADDR,
	};

	static int __init init_dbox2_flash(void)
	{
	printk(KERN_NOTICE "D-Box 2 flash driver (size->0x%X mem->0x%X)\n", WINDOW_SIZE, WINDOW_ADDR);
	dbox2_flash_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);

	if (!dbox2_flash_map.virt) {
	printk("Failed to ioremap\n");
	return -EIO;
	}
	simple_map_init(&dbox2_flash_map);

	// Probe for dual Intel 28F320 or dual AMD
	mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
	if (!mymtd) {
	// Probe for single Intel 28F640
	dbox2_flash_map.bankwidth = 2;

	mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
	}

	if (mymtd) {
	mymtd->owner = THIS_MODULE;

	/* Create MTD devices for each partition. */
	mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);

	return 0;
	}

	iounmap((void *)dbox2_flash_map.virt);
	return -ENXIO;
	}

	static void __exit cleanup_dbox2_flash(void)
	{
	if (mymtd) {
	mtd_device_unregister(mymtd);
	map_destroy(mymtd);
	}
	if (dbox2_flash_map.virt) {
	iounmap((void *)dbox2_flash_map.virt);
	dbox2_flash_map.virt = 0;
	}
	}

	module_init(init_dbox2_flash);
	module_exit(cleanup_dbox2_flash);


	MODULE_LICENSE("GPL");
	MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>, Bastian Blank <waldi@tuxbox.org>, Alexander Wild <wild@te-elektronik.com>");
	MODULE_DESCRIPTION("MTD map driver for D-Box 2 board");