Re: [PATCH 2/3] mtd: delete SBC82xx/SBC8560 MTD mapping support

2012-06-29 Thread Paul Gortmaker
On 12-06-29 04:29 AM, Artem Bityutskiy wrote:
> On Tue, 2012-06-26 at 15:54 -0400, Paul Gortmaker wrote:
>> The SBC8260 support was dropped back when we moved from ppc to
>> powerpc.  We are now also dropping the support for the EOL SBC8560,
>> so we can also delete this mapping support, as they were the only
>> users of it.
>>
>> Cc: David Woodhouse 
>> Cc: linux-...@lists.infradead.org
>> Signed-off-by: Paul Gortmaker 
> 
> You forgot this:
> 
> diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
> index 68a9a91..deb43e9 100644
> --- a/drivers/mtd/maps/Makefile
> +++ b/drivers/mtd/maps/Makefile
> @@ -47,7 +47,6 @@ obj-$(CONFIG_MTD_SCB2_FLASH)  += scb2_flash.o
>  obj-$(CONFIG_MTD_H720X)+= h720x-flash.o
>  obj-$(CONFIG_MTD_IXP4XX)   += ixp4xx.o
>  obj-$(CONFIG_MTD_IXP2000)  += ixp2000.o
> -obj-$(CONFIG_MTD_WRSBC8260)+= wr_sbc82xx_flash.o

Agreed.  I'd figured that died back in 2.6.2x when the old
ppc board got removed, and it never even crossed my mind to
git grep for it.  Funny that some automated orphan CONFIG_
checker script didn't find it (assuming there is one.)

Thanks,
Paul.
--

>  obj-$(CONFIG_MTD_DMV182)   += dmv182.o
>  obj-$(CONFIG_MTD_PLATRAM)  += plat-ram.o
>  obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
> 
> I've amended the patch and pushed to l2-mtd.git tree, thanks!
> 
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev


Re: [PATCH 2/3] mtd: delete SBC82xx/SBC8560 MTD mapping support

2012-06-29 Thread Artem Bityutskiy
On Tue, 2012-06-26 at 15:54 -0400, Paul Gortmaker wrote:
> The SBC8260 support was dropped back when we moved from ppc to
> powerpc.  We are now also dropping the support for the EOL SBC8560,
> so we can also delete this mapping support, as they were the only
> users of it.
> 
> Cc: David Woodhouse 
> Cc: linux-...@lists.infradead.org
> Signed-off-by: Paul Gortmaker 

You forgot this:

diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 68a9a91..deb43e9 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_MTD_SCB2_FLASH)  += scb2_flash.o
 obj-$(CONFIG_MTD_H720X)+= h720x-flash.o
 obj-$(CONFIG_MTD_IXP4XX)   += ixp4xx.o
 obj-$(CONFIG_MTD_IXP2000)  += ixp2000.o
-obj-$(CONFIG_MTD_WRSBC8260)+= wr_sbc82xx_flash.o
 obj-$(CONFIG_MTD_DMV182)   += dmv182.o
 obj-$(CONFIG_MTD_PLATRAM)  += plat-ram.o
 obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o

I've amended the patch and pushed to l2-mtd.git tree, thanks!

-- 
Best Regards,
Artem Bityutskiy


signature.asc
Description: This is a digitally signed message part
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH 2/3] mtd: delete SBC82xx/SBC8560 MTD mapping support

2012-06-26 Thread Paul Gortmaker
The SBC8260 support was dropped back when we moved from ppc to
powerpc.  We are now also dropping the support for the EOL SBC8560,
so we can also delete this mapping support, as they were the only
users of it.

Cc: David Woodhouse 
Cc: linux-...@lists.infradead.org
Signed-off-by: Paul Gortmaker 
---
 drivers/mtd/maps/Kconfig|   12 ---
 drivers/mtd/maps/wr_sbc82xx_flash.c |  174 ---
 2 files changed, 0 insertions(+), 186 deletions(-)
 delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 185454a..626200a 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -447,18 +447,6 @@ config MTD_UCLINUX
help
  Map driver to support image based filesystems for uClinux.
 
-config MTD_WRSBC8260
-   tristate "Map driver for WindRiver PowerQUICC II MPC82xx board"
-   depends on (SBC82xx || SBC8560)
-   select MTD_MAP_BANK_WIDTH_4
-   select MTD_MAP_BANK_WIDTH_1
-   select MTD_CFI_I1
-   select MTD_CFI_I4
-   help
- Map driver for WindRiver PowerQUICC II MPC82xx board. Drives
- all three flash regions on CS0, CS1 and CS6 if they are configured
- correctly by the boot loader.
-
 config MTD_DMV182
 tristate "Map driver for Dy-4 SVME/DMV-182 board."
 depends on DMV182
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c 
b/drivers/mtd/maps/wr_sbc82xx_flash.c
deleted file mode 100644
index e7534c8..000
--- a/drivers/mtd/maps/wr_sbc82xx_flash.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Map for flash chips on Wind River PowerQUICC II SBC82xx board.
- *
- * Copyright (C) 2004 Red Hat, Inc.
- *
- * Author: David Woodhouse 
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-static struct mtd_info *sbcmtd[3];
-
-struct map_info sbc82xx_flash_map[3] = {
-   {.name = "Boot flash"},
-   {.name = "Alternate boot flash"},
-   {.name = "User flash"}
-};
-
-static struct mtd_partition smallflash_parts[] = {
-   {
-   .name = "space",
-   .size = 0x10,
-   .offset =   0,
-   }, {
-   .name = "bootloader",
-   .size = MTDPART_SIZ_FULL,
-   .offset =   MTDPART_OFS_APPEND,
-   }
-};
-
-static struct mtd_partition bigflash_parts[] = {
-   {
-   .name = "bootloader",
-   .size = 0x0010,
-   .offset =   0,
-   }, {
-   .name = "file system",
-   .size = 0x01f0,
-   .offset =   MTDPART_OFS_APPEND,
-   }, {
-   .name = "boot config",
-   .size = 0x0010,
-   .offset =   MTDPART_OFS_APPEND,
-   }, {
-   .name = "space",
-   .size = 0x01f0,
-   .offset =   MTDPART_OFS_APPEND,
-   }
-};
-
-static const char *part_probes[] __initconst = {"cmdlinepart", "RedBoot", 
NULL};
-
-#define init_sbc82xx_one_flash(map, br, or)\
-do {   \
-   (map).phys = (br & 1) ? (br & 0x8000) : 0;  \
-   (map).size = (br & 1) ? (~(or & 0x8000) + 1) : 0;   \
-   switch (br & 0x1800) {  \
-   case 0x:\
-   case 0x0800:(map).bankwidth = 1;break;  \
-   case 0x1000:(map).bankwidth = 2;break;  \
-   case 0x1800:(map).bankwidth = 4;break;  \
-   }   \
-} while (0);
-
-static int __init init_sbc82xx_flash(void)
-{
-   volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl;
-   int bigflash;
-   int i;
-
-#ifdef CONFIG_SBC8560
-   mc = ioremap(0xff70 + 0x5000, sizeof(memctl_cpm2_t));
-#else
-   mc = &cpm2_immr->im_memctl;
-#endif
-
-   bigflash = 1;
-   if ((mc->memc_br0 & 0x1800) == 0x1800)
-   bigflash = 0;
-
-   init_sbc82xx_one_flash(sbc82xx_flash_map[0], mc->memc_br0, 
mc->memc_or0);
-   init_sbc82xx_one_flash(sbc82xx_flash_map[1], mc->memc_br6, 
mc->memc_or6);
-   init_sbc82xx_one_flash(sbc82xx_flash_map[2], mc->memc_br1, 
mc->memc_or1);
-
-#ifdef CONFIG_SBC8560
-   iounmap((void *) mc);
-#endif
-
-   for (i=0; i<3; i++) {
-   int8_t flashcs[3] = { 0, 6, 1 };
-   int nr_parts;
-   struct mtd_partition *defparts;
-
-   printk(KERN_NOTICE "PowerQUICC II %s (%ld MiB on CS%d",
-  sbc82xx_flash_map[i].name,
-  (sbc82xx_flash_map[i].size >> 20),
-  flashcs[i]);
-   if (!sbc82xx_flash_map[i].phys) {
-   /