kernel: update kernel 4.4 to version 4.4.7

[openwrt/openwrt.git] / target / linux / mediatek / patches-4.4 / 0058-mtd-mediatek-driver-for-MTK-Smart-Device-Gen1-NAND.patch

diff --git a/target/linux/mediatek/patches-4.4/0058-mtd-mediatek-driver-for-MTK-Smart-Device-Gen1-NAND.patch b/target/linux/mediatek/patches-4.4/0058-mtd-mediatek-driver-for-MTK-Smart-Device-Gen1-NAND.patch
index 49f670e5e871c54a931adf60582c7fb184061b98..25a2c57beb08cd9c4228c1931487e738c10c2c7f 100644 (file)
--- a/target/linux/mediatek/patches-4.4/0058-mtd-mediatek-driver-for-MTK-Smart-Device-Gen1-NAND.patch
+++ b/target/linux/mediatek/patches-4.4/0058-mtd-mediatek-driver-for-MTK-Smart-Device-Gen1-NAND.patch
@@ -20,8 +20,6 @@ Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
  create mode 100644 drivers/mtd/nand/mtksdg1_nand_ecc.h
  create mode 100644 drivers/mtd/nand/mtksdg1_nand_nfi.h
 
-diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
-index 2896640..5ec072a 100644
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
 @@ -546,4 +546,10 @@ config MTD_NAND_HISI504
@@ -35,20 +33,15 @@ index 2896640..5ec072a 100644
 +      Enables support for NAND controller on MTK Smart Device SoCs.
 +
  endif # MTD_NAND
-diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
-index 2c7f014..2a2620c 100644
 --- a/drivers/mtd/nand/Makefile
 +++ b/drivers/mtd/nand/Makefile
-@@ -55,5 +55,6 @@ obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/
+@@ -55,5 +55,6 @@ obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) +=
  obj-$(CONFIG_MTD_NAND_SUNXI)          += sunxi_nand.o
  obj-$(CONFIG_MTD_NAND_HISI504)                += hisi504_nand.o
  obj-$(CONFIG_MTD_NAND_BRCMNAND)               += brcmnand/
 +obj-$(CONFIG_MTD_NAND_MTKSDG1)                += mtksdg1_nand.o
  
  nand-objs := nand_base.o nand_bbt.o nand_timings.o
-diff --git a/drivers/mtd/nand/mtksdg1_nand.c b/drivers/mtd/nand/mtksdg1_nand.c
-new file mode 100644
-index 0000000..55dd17d
 --- /dev/null
 +++ b/drivers/mtd/nand/mtksdg1_nand.c
 @@ -0,0 +1,1535 @@
@@ -1587,9 +1580,6 @@ index 0000000..55dd17d
 +MODULE_AUTHOR("Xiaolei Li <xiaolei.li@mediatek.com>");
 +MODULE_DESCRIPTION("MTK Nand Flash Controller Driver");
 +
-diff --git a/drivers/mtd/nand/mtksdg1_nand_ecc.h b/drivers/mtd/nand/mtksdg1_nand_ecc.h
-new file mode 100644
-index 0000000..d90b196
 --- /dev/null
 +++ b/drivers/mtd/nand/mtksdg1_nand_ecc.h
 @@ -0,0 +1,75 @@
@@ -1668,9 +1658,6 @@ index 0000000..d90b196
 +#define               DECFSM_MASK             (0x7f0f0f0f)
 +#define               DECFSM_IDLE             (0x01010101)
 +#endif
-diff --git a/drivers/mtd/nand/mtksdg1_nand_nfi.h b/drivers/mtd/nand/mtksdg1_nand_nfi.h
-new file mode 100644
-index 0000000..a9aa6f6
 --- /dev/null
 +++ b/drivers/mtd/nand/mtksdg1_nand_nfi.h
 @@ -0,0 +1,119 @@
@@ -1793,6 +1780,3 @@ index 0000000..a9aa6f6
 +
 +#endif
 +
--- 
-1.7.10.4
-