diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-20 23:21:52 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-20 23:24:02 +0100 |
| commit | 4d649ba949752f8e2fe4a4ff0c79ae3ab3124f48 (patch) | |
| tree | 0b7fe545619ca6a463b55ee610469941b03cc301 /target/linux/ipq806x/patches-4.9 | |
| parent | e390756effa8341b3b3c7c44b339b8bfcf610b68 (diff) | |
| download | upstream-4d649ba949752f8e2fe4a4ff0c79ae3ab3124f48.tar.gz upstream-4d649ba949752f8e2fe4a4ff0c79ae3ab3124f48.tar.bz2 upstream-4d649ba949752f8e2fe4a4ff0c79ae3ab3124f48.zip | |
ipq806x: make patches apply again
Some part of this patch was added to the generic patches as it was
needed also for some other target. Do not add it here any more.
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/linux/ipq806x/patches-4.9')
| -rw-r--r-- | target/linux/ipq806x/patches-4.9/104-mtd-nand-add-Winbond-manufacturer-and-chip.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/target/linux/ipq806x/patches-4.9/104-mtd-nand-add-Winbond-manufacturer-and-chip.patch b/target/linux/ipq806x/patches-4.9/104-mtd-nand-add-Winbond-manufacturer-and-chip.patch index 5aa37db086..d2b58a4660 100644 --- a/target/linux/ipq806x/patches-4.9/104-mtd-nand-add-Winbond-manufacturer-and-chip.patch +++ b/target/linux/ipq806x/patches-4.9/104-mtd-nand-add-Winbond-manufacturer-and-chip.patch @@ -36,21 +36,3 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> 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 |