36f1978a70
Support for Winbond NAND flash detection was added into the generic
patches and this conflicted with this patch adding Gigadevice support.
Fixes: 02050f7e7d ("kernel/4.{4, 9}: add manufacturer ID for Winbond NANDs")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From a4bc33b205fd9b1db862f1e45173dba57b0fa57f Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
|
|
Date: Sat, 25 Feb 2017 15:43:09 +0000
|
|
Subject: mtd: nand: Add JEDEC manufacturer ID for Gigadevice
|
|
|
|
This commit adds Gigadevice to the list of manufacturer ID and name strings.
|
|
|
|
(picked from http://lists.infradead.org/pipermail/linux-mtd/2014-December/056765.html)
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
|
|
---
|
|
drivers/mtd/nand/nand_ids.c | 1 +
|
|
include/linux/mtd/nand.h | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
--- a/drivers/mtd/nand/nand_ids.c
|
|
+++ b/drivers/mtd/nand/nand_ids.c
|
|
@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids
|
|
{NAND_MFR_SANDISK, "SanDisk"},
|
|
{NAND_MFR_INTEL, "Intel"},
|
|
{NAND_MFR_ATO, "ATO"},
|
|
+ {NAND_MFR_GIGADEVICE, "Gigadevice"},
|
|
{NAND_MFR_WINBOND, "Winbond"},
|
|
{0x0, "Unknown"}
|
|
};
|
|
--- a/include/linux/mtd/nand.h
|
|
+++ b/include/linux/mtd/nand.h
|
|
@@ -928,6 +928,7 @@ static inline void nand_set_controller_d
|
|
#define NAND_MFR_SANDISK 0x45
|
|
#define NAND_MFR_INTEL 0x89
|
|
#define NAND_MFR_ATO 0x9b
|
|
+#define NAND_MFR_GIGADEVICE 0xc8
|
|
#define NAND_MFR_WINBOND 0xef
|
|
|
|
/* The maximum expected count of bytes in the NAND ID sequence */
|