kernel: update kernel 4.9 to version 4.9.91

[openwrt/openwrt.git] / target / linux / layerscape / patches-4.9 / 402-mtd-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch b/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch
index 14f503f8e5375e65b4323ec6e420ed9d07140db3..6b3485700a5e7c78b5c3daa78952d8cb55303a94 100644 (file)
--- a/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch
@@ -358,7 +358,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        help
 --- a/drivers/mtd/nand/fsl_ifc_nand.c
 +++ b/drivers/mtd/nand/fsl_ifc_nand.c
-@@ -904,9 +904,12 @@ static int fsl_ifc_chip_init(struct fsl_
+@@ -898,7 +898,7 @@ static int fsl_ifc_chip_init(struct fsl_
                chip->ecc.algo = NAND_ECC_HAMMING;
        }
  
@@ -366,12 +366,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 +      if (ctrl->version >= FSL_IFC_VERSION_1_1_0)
                fsl_ifc_sram_init(priv);
  
-+      if (ctrl->version >= FSL_IFC_VERSION_2_0_0)
-+              priv->bufnum_mask = (priv->bufnum_mask * 2) + 1;
-+
-       return 0;
- }
- 
+       /*
 --- a/include/linux/fsl_ifc.h
 +++ b/include/linux/fsl_ifc.h
 @@ -274,6 +274,8 @@
@@ -383,7 +378,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  /* Addressing Mode-ROW0+n/COL0 */
  #define IFC_NAND_NCFGR_ADDR_MODE_RC0  0x00000000
  /* Addressing Mode-ROW0+n/COL0+n */
-@@ -861,6 +863,11 @@ struct fsl_ifc_ctrl {
+@@ -857,6 +859,11 @@ struct fsl_ifc_ctrl {
        u32 nand_stat;
        wait_queue_head_t nand_wait;
        bool little_endian;