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