aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-01-20 23:36:05 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-01-20 23:36:05 +0100
commit36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51 (patch)
tree686e16caabf5e0497a6f78a31e1598b8e55c85d9 /target
parent4d649ba949752f8e2fe4a4ff0c79ae3ab3124f48 (diff)
downloadupstream-36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51.tar.gz
upstream-36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51.tar.bz2
upstream-36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51.zip
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: 02050f7e7d5b ("kernel/4.{4, 9}: add manufacturer ID for Winbond NANDs") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch b/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
index eceb304006..3fa8c238e5 100644
--- a/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
+++ b/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
@@ -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