target/linux/ipq806x/patches-4.9/104-mtd-nand-add-Winbond-manufacturer-and-chip.patch

   1 From 07b6d0cdbbda8c917480eceaec668f09e4cf24a5 Mon Sep 17 00:00:00 2001
   2 From: Christian Lamparter <chunkeey@gmail.com>
   3 Date: Mon, 14 Nov 2016 23:49:22 +0100
   4 Subject: [PATCH] mtd: nand: add Winbond manufacturer and chip
   5
   6 This patch adds the W25N01GV NAND to the table of
   7 known devices. Without this patch the device gets detected:
   8
   9 nand: device found, Manufacturer ID: 0xef, Chip ID: 0xaa
  10 nand: Unknown NAND 256MiB 1,8V 8-bit
  11 nand: 256 MiB, SLC, erase size: 64 KiB, page size: 1024, OOB size : 16
  12
  13 Whereas the u-boot identifies it as:
  14 spi_nand: spi_nand_flash_probe SF NAND ID 00:ef:aa:21
  15 SF: Detected W25N01GV with page size 2 KiB, total 128 MiB
  16
  17 Due to the page size discrepancy, it's impossible to attach
  18 ubi volumes on the device.
  19
  20 Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  21 ---
  22  drivers/mtd/nand/nand_ids.c | 4 ++++
  23  include/linux/mtd/nand.h    | 1 +
  24  2 files changed, 5 insertions(+)
  25
  26 --- a/drivers/mtd/nand/nand_ids.c
  27 +++ b/drivers/mtd/nand/nand_ids.c
  28 @@ -52,6 +52,10 @@ struct nand_flash_dev nand_flash_ids[] =
  29                 { .id = {0xad, 0xde, 0x94, 0xda, 0x74, 0xc4} },
  30                   SZ_8K, SZ_8K, SZ_2M, NAND_NEED_SCRAMBLING, 6, 640,
  31                   NAND_ECC_INFO(40, SZ_1K), 4 },
  32 +       {"W25N01GV 1G 3.3V 8-bit",
  33 +               { .id = {0xef, 0xaa} },
  34 +                 SZ_2K, SZ_128, SZ_128K, NAND_NO_SUBPAGE_WRITE,
  35 +                 2, 64, NAND_ECC_INFO(1, SZ_512) },
  36
  37         LEGACY_ID_NAND("NAND 4MiB 5V 8-bit",   0x6B, 4, SZ_8K, SP_OPTIONS),
  38         LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xE3, 4, SZ_8K, SP_OPTIONS),
  39 @@ -182,6 +186,7 @@ struct nand_manufacturers nand_manuf_ids
  40         {NAND_MFR_SANDISK, "SanDisk"},
  41         {NAND_MFR_INTEL, "Intel"},
  42         {NAND_MFR_ATO, "ATO"},
  43 +       {NAND_MFR_WINBOND, "Winbond"},
  44         {0x0, "Unknown"}
  45  };
  46
  47 --- a/include/linux/mtd/nand.h
  48 +++ b/include/linux/mtd/nand.h
  49 @@ -924,6 +924,7 @@ static inline void nand_set_controller_d
  50  #define NAND_MFR_MICRON                0x2c
  51  #define NAND_MFR_AMD           0x01
  52  #define NAND_MFR_MACRONIX      0xc2
  53 +#define NAND_MFR_WINBOND       0xef
  54  #define NAND_MFR_EON           0x92
  55  #define NAND_MFR_SANDISK       0x45
  56  #define NAND_MFR_INTEL         0x89