mtd: maps: remove the now unused bcm963xx-flash

bcm963xx-flash does nothing meaningful anymore.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

3 files changed, 0 insertions, 130 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index acc5e0816000..6c5c431c64af 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -242,16 +242,6 @@ config MTD_NETtel
         help
           Support for flash chips on NETtel/SecureEdge/SnapGear boards.
 
-config MTD_BCM963XX
-        tristate "Map driver for Broadcom BCM963xx boards"
-        depends on BCM63XX
-        select MTD_MAP_BANK_WIDTH_2
-        select MTD_CFI_I1
-        select MTD_BCM63XX_PARTS
-        help
-          Support for parsing CFE image tag and creating MTD partitions on
-          Broadcom BCM63xx boards.
-
 config MTD_LANTIQ
         tristate "Lantiq SoC NOR support"
         depends on LANTIQ
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 45dcb8b14f22..68a9a91d344f 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -55,6 +55,5 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)	+= bfin-async-flash.o
 obj-$(CONFIG_MTD_RBTX4939)      += rbtx4939-flash.o
 obj-$(CONFIG_MTD_VMU)           += vmu-flash.o
 obj-$(CONFIG_MTD_GPIO_ADDR)     += gpio-addr-flash.o
-obj-$(CONFIG_MTD_BCM963XX)      += bcm963xx-flash.o
 obj-$(CONFIG_MTD_LATCH_ADDR)    += latch-addr-flash.o
 obj-$(CONFIG_MTD_LANTIQ)        += lantiq-flash.o
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
deleted file mode 100644
index 830264807bb4..000000000000
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright © 2006-2008  Florian Fainelli <florian@openwrt.org>
- *                        Mike Albon <malbon@openwrt.org>
- * Copyright © 2009-2010  Daniel Dickinson <openwrt@cshore.neomailbox.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-
-#define BCM63XX_BUSWIDTH        2               /* Buswidth */
-
-static struct mtd_info *bcm963xx_mtd_info;
-
-static struct map_info bcm963xx_map = {
-        .name           = "bcm963xx",
-        .bankwidth      = BCM63XX_BUSWIDTH,
-};
-
-static const char *part_types[] = { "bcm63xxpart", NULL };
-
-static int bcm963xx_probe(struct platform_device *pdev)
-{
-        int err = 0;
-        struct resource *r;
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!r) {
-                dev_err(&pdev->dev, "no resource supplied\n");
-                return -ENODEV;
-        }
-
-        bcm963xx_map.phys = r->start;
-        bcm963xx_map.size = resource_size(r);
-        bcm963xx_map.virt = ioremap(r->start, resource_size(r));
-        if (!bcm963xx_map.virt) {
-                dev_err(&pdev->dev, "failed to ioremap\n");
-                return -EIO;
-        }
-
-        dev_info(&pdev->dev, "0x%08lx at 0x%08x\n",
-                                        bcm963xx_map.size, bcm963xx_map.phys);
-
-        simple_map_init(&bcm963xx_map);
-
-        bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
-        if (!bcm963xx_mtd_info) {
-                dev_err(&pdev->dev, "failed to probe using CFI\n");
-                bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map);
-                if (bcm963xx_mtd_info)
-                        goto probe_ok;
-                dev_err(&pdev->dev, "failed to probe using JEDEC\n");
-                err = -EIO;
-                goto err_probe;
-        }
-
-probe_ok:
-        bcm963xx_mtd_info->owner = THIS_MODULE;
-
-        return mtd_device_parse_register(bcm963xx_mtd_info, part_types, NULL,
-                                         NULL, 0);
-err_probe:
-        iounmap(bcm963xx_map.virt);
-        return err;
-}
-
-static int bcm963xx_remove(struct platform_device *pdev)
-{
-        if (bcm963xx_mtd_info) {
-                mtd_device_unregister(bcm963xx_mtd_info);
-                map_destroy(bcm963xx_mtd_info);
-        }
-
-        if (bcm963xx_map.virt) {
-                iounmap(bcm963xx_map.virt);
-                bcm963xx_map.virt = 0;
-        }
-
-        return 0;
-}
-
-static struct platform_driver bcm63xx_mtd_dev = {
-        .probe  = bcm963xx_probe,
-        .remove = bcm963xx_remove,
-        .driver = {
-                .name   = "bcm963xx-flash",
-                .owner  = THIS_MODULE,
-        },
-};
-
-module_platform_driver(bcm63xx_mtd_dev);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Broadcom BCM63xx MTD driver for CFE and RedBoot");
-MODULE_AUTHOR("Daniel Dickinson <openwrt@cshore.neomailbox.net>");
-MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
-MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>");