[PATCH 1/2] mtd: m25p80: Add support for serial flash Spansion S25FL132K

[Jagan Teki]

On 10 November 2014 21:24,  <alison_chaiken at mentor.com> wrote:
> From: Knut Wohlrab <knut.wohlrab at de.bosch.com>
>
> Signed-off-by: Knut Wohlrab <knut.wohlrab at de.bosch.com>
> Signed-off-by: Alison Chaiken <alison_chaiken at mentor.com>
>
> Conflicts:
>
>         drivers/mtd/devices/m25p80.c
> ---
>  drivers/mtd/devices/m25p80.c  | 4 +---
>  drivers/mtd/spi-nor/spi-nor.c | 1 +
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
> index 35e7e98..2783e94 100644
> --- a/drivers/mtd/devices/m25p80.c
> +++ b/drivers/mtd/devices/m25p80.c
> @@ -252,7 +252,6 @@ static int m25p_remove(struct spi_device *spi)
>         return mtd_device_unregister(&flash->mtd);
>  }
>
> -
>  /*
>   * XXX This needs to be kept in sync with spi_nor_ids.  We can't share
>   * it with spi-nor, because if this is built as a module then modpost
> @@ -279,7 +278,7 @@ static const struct spi_device_id m25p_ids[] = {
>         {"s25fl512s"},  {"s70fl01gs"},  {"s25sl12800"}, {"s25sl12801"},
>         {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"},  {"s25sl008a"},
>         {"s25sl016a"},  {"s25sl032a"},  {"s25sl064a"},  {"s25fl008k"},
> -       {"s25fl016k"},  {"s25fl064k"},
> +       {"s25fl016k"},  {"s25fl064k"},  {"s25fl132k"},
>         {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"},
>         {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"},
>         {"sst25wf040"},
> @@ -302,7 +301,6 @@ static const struct spi_device_id m25p_ids[] = {
>  };
>  MODULE_DEVICE_TABLE(spi, m25p_ids);
>
> -
>  static struct spi_driver m25p80_driver = {
>         .driver = {
>                 .name   = "m25p80",
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index eafaeeb..7b468a6 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -559,6 +559,7 @@ static const struct spi_device_id spi_nor_ids[] = {
>         { "s25fl008k",  INFO(0xef4014,      0,  64 * 1024,  16, SECT_4K) },
>         { "s25fl016k",  INFO(0xef4015,      0,  64 * 1024,  32, SECT_4K) },
>         { "s25fl064k",  INFO(0xef4017,      0,  64 * 1024, 128, SECT_4K) },
> +       { "s25fl132k",  INFO(0x014016,      0,  64 * 1024,  64, 0) },
>
>         /* SST -- large erase sizes are "overlays", "sectors" are 4K */
>         { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024,  8, SECT_4K | SST_WRITE) },
> --

Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki at gmail.com>

thanks!
-- 
Jagan.