pistachio: make patches apply again
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>
This commit is contained in:
parent
4d649ba949
commit
36f1978a70
1 changed files with 2 additions and 2 deletions
|
@ -20,9 +20,9 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
|
|||
{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
|
||||
|
@ -30,6 +30,6 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
|
|||
#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 */
|
||||
#define NAND_MAX_ID_LEN 8
|
||||
|
|
Loading…
Reference in a new issue