pistachio: make patches apply again

[openwrt/openwrt.git] / target / linux / pistachio / patches-4.9 / 412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch

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 f8ebac5a1d2c5d104e6f56ca7875fa2f0809778a..3fa8c238e54e15b2539b700b524db2217e368dcb 100644 (file)
--- 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
@@ -13,30 +13,23 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
  include/linux/mtd/nand.h    | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
-index 2af9869..dc80fcd 100644
 --- a/drivers/mtd/nand/nand_ids.c
 +++ b/drivers/mtd/nand/nand_ids.c
-@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
+@@ -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"}
  };
- 
-diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
-index d8905a2..3a00df7 100644
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h
-@@ -928,6 +928,7 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv)
+@@ -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 */
- #define NAND_MAX_ID_LEN 8
--- 
-2.7.4
-