package/linux/kernel-patches/020-drivers_mtd-jumbo

   1 diff -Nur linux-mips-cvs/drivers/mtd/chips/Config.in linux-broadcom/drivers/mtd/chips/Config.in
   2 --- linux-mips-cvs/drivers/mtd/chips/Config.in  2003-02-26 01:53:49.000000000 +0100
   3 +++ linux-broadcom/drivers/mtd/chips/Config.in  2005-01-31 13:13:14.000000000 +0100
   4 @@ -45,6 +45,7 @@
   5  dep_tristate '  Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE
   6  dep_tristate '  Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
   7  dep_tristate '  Support for ST (Advanced Architecture) flash chips' CONFIG_MTD_CFI_STAA $CONFIG_MTD_GEN_PROBE
   8 +dep_tristate '  Support for SST flash chips' CONFIG_MTD_CFI_SSTSTD $CONFIG_MTD_GEN_PROBE
   9
  10  dep_tristate '  Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD
  11  dep_tristate '  Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD
  12 diff -Nur linux-mips-cvs/drivers/mtd/chips/Makefile linux-broadcom/drivers/mtd/chips/Makefile
  13 --- linux-mips-cvs/drivers/mtd/chips/Makefile   2003-07-05 05:23:38.000000000 +0200
  14 +++ linux-broadcom/drivers/mtd/chips/Makefile   2005-01-31 13:13:14.000000000 +0100
  15 @@ -18,6 +18,7 @@
  16  obj-$(CONFIG_MTD_AMDSTD)       += amd_flash.o
  17  obj-$(CONFIG_MTD_CFI)          += cfi_probe.o
  18  obj-$(CONFIG_MTD_CFI_STAA)     += cfi_cmdset_0020.o
  19 +obj-$(CONFIG_MTD_CFI_SSTSTD)   += cfi_cmdset_0701.o
  20  obj-$(CONFIG_MTD_CFI_AMDSTD)   += cfi_cmdset_0002.o
  21  obj-$(CONFIG_MTD_CFI_INTELEXT) += cfi_cmdset_0001.o
  22  obj-$(CONFIG_MTD_GEN_PROBE)    += gen_probe.o
  23 diff -Nur linux-mips-cvs/drivers/mtd/chips/cfi_probe.c linux-broadcom/drivers/mtd/chips/cfi_probe.c
  24 --- linux-mips-cvs/drivers/mtd/chips/cfi_probe.c        2003-02-26 01:53:49.000000000 +0100
  25 +++ linux-broadcom/drivers/mtd/chips/cfi_probe.c        2005-01-31 13:13:14.000000000 +0100
  26 @@ -67,8 +67,15 @@
  27         cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
  28         cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL);
  29
  30 -       if (!qry_present(map,base,cfi))
  31 -               return 0;
  32 +       if (!qry_present(map,base,cfi)) {
  33 +               /* rather broken SST cfi probe (requires SST unlock) */
  34 +               cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
  35 +               cfi_send_gen_cmd(0xAA, 0x5555, base, map, cfi, cfi->device_type, NULL);
  36 +               cfi_send_gen_cmd(0x55, 0x2AAA, base, map, cfi, cfi->device_type, NULL);
  37 +               cfi_send_gen_cmd(0x98, 0x5555, base, map, cfi, cfi->device_type, NULL);
  38 +               if (!qry_present(map,base,cfi))
  39 +                       return 0;
  40 +       }
  41
  42         if (!cfi->numchips) {
  43                 /* This is the first time we're called. Set up the CFI
  44 diff -Nur linux-mips-cvs/drivers/mtd/chips/gen_probe.c linux-broadcom/drivers/mtd/chips/gen_probe.c
  45 --- linux-mips-cvs/drivers/mtd/chips/gen_probe.c        2003-08-13 19:19:18.000000000 +0200
  46 +++ linux-broadcom/drivers/mtd/chips/gen_probe.c        2005-01-31 13:13:14.000000000 +0100
  47 @@ -332,9 +332,13 @@
  48                 return cfi_cmdset_0002(map, primary);
  49  #endif
  50  #ifdef CONFIG_MTD_CFI_STAA
  51 -        case 0x0020:
  52 +       case 0x0020:
  53                 return cfi_cmdset_0020(map, primary);
  54  #endif
  55 +#ifdef CONFIG_MTD_CFI_SSTSTD
  56 +       case 0x0701:
  57 +               return cfi_cmdset_0701(map, primary);
  58 +#endif
  59         }
  60
  61         return cfi_cmdset_unknown(map, primary);
  62 diff -Nur linux-mips-cvs/drivers/mtd/devices/Config.in linux-broadcom/drivers/mtd/devices/Config.in
  63 --- linux-mips-cvs/drivers/mtd/devices/Config.in        2003-02-26 01:53:49.000000000 +0100
  64 +++ linux-broadcom/drivers/mtd/devices/Config.in        2005-01-31 13:13:14.000000000 +0100
  65 @@ -5,6 +5,7 @@
  66  mainmenu_option next_comment
  67
  68  comment 'Self-contained MTD device drivers'
  69 +bool '  Broadcom Chipcommon Serial Flash support' CONFIG_MTD_SFLASH
  70  dep_tristate '  Ramix PMC551 PCI Mezzanine RAM card support' CONFIG_MTD_PMC551 $CONFIG_MTD $CONFIG_PCI
  71  if [ "$CONFIG_MTD_PMC551" = "y" -o  "$CONFIG_MTD_PMC551" = "m" ]; then
  72     bool '    PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
  73 diff -Nur linux-mips-cvs/drivers/mtd/devices/Makefile linux-broadcom/drivers/mtd/devices/Makefile
  74 --- linux-mips-cvs/drivers/mtd/devices/Makefile 2002-03-30 09:15:50.000000000 +0100
  75 +++ linux-broadcom/drivers/mtd/devices/Makefile 2005-01-31 13:13:14.000000000 +0100
  76 @@ -12,6 +12,7 @@
  77  # here where previously there was none.  We now have to ensure that
  78  # doc200[01].o are linked before docprobe.o
  79
  80 +obj-$(CONFIG_MTD_SFLASH)       += sflash.o
  81  obj-$(CONFIG_MTD_DOC1000)      += doc1000.o
  82  obj-$(CONFIG_MTD_DOC2000)      += doc2000.o
  83  obj-$(CONFIG_MTD_DOC2001)      += doc2001.o
  84 diff -Nur linux-mips-cvs/drivers/mtd/maps/Config.in linux-broadcom/drivers/mtd/maps/Config.in
  85 --- linux-mips-cvs/drivers/mtd/maps/Config.in   2004-02-26 01:46:35.000000000 +0100
  86 +++ linux-broadcom/drivers/mtd/maps/Config.in   2005-01-31 13:13:14.000000000 +0100
  87 @@ -48,6 +48,7 @@
  88  fi
  89
  90  if [ "$CONFIG_MIPS" = "y" ]; then
  91 +   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
  92     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
  93     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
  94     dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
  95 diff -Nur linux-mips-cvs/drivers/mtd/maps/Makefile linux-broadcom/drivers/mtd/maps/Makefile
  96 --- linux-mips-cvs/drivers/mtd/maps/Makefile    2004-02-26 01:46:35.000000000 +0100
  97 +++ linux-broadcom/drivers/mtd/maps/Makefile    2005-01-31 13:13:14.000000000 +0100
  98 @@ -10,6 +10,7 @@
  99  endif
 100
 101  # Chip mappings
 102 +obj-$(CONFIG_MTD_BCM947XX)     += bcm947xx-flash.o
 103  obj-$(CONFIG_MTD_CDB89712)     += cdb89712.o
 104  obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
 105  obj-$(CONFIG_MTD_CFI_FLAGADM)  += cfi_flagadm.o