diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
commit | 098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch) | |
tree | e4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch | |
parent | bbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff) | |
download | master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2 master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.zip |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch')
-rw-r--r-- | target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch b/target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch index 4430a50822..c6554da68d 100644 --- a/target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch +++ b/target/linux/sunxi/patches-4.1/117-mtd-nand-add-hynix-init.patch @@ -15,8 +15,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> 4 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 drivers/mtd/nand/nand_hynix.c -diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index fcbe032..07b7c8c 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -5,7 +5,7 @@ @@ -28,9 +26,6 @@ index fcbe032..07b7c8c 100644 obj-$(CONFIG_MTD_SM_COMMON) += sm_common.o obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o -diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c -new file mode 100644 -index 0000000..0d051bf5 --- /dev/null +++ b/drivers/mtd/nand/nand_hynix.c @@ -0,0 +1,159 @@ @@ -193,11 +188,9 @@ index 0000000..0d051bf5 +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Boris BREZILLON <b.brezillon.dev@gmail.com>"); +MODULE_DESCRIPTION("Hynix NAND specific code"); -diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c -index dd620c1..b786718 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c -@@ -163,6 +163,7 @@ struct nand_flash_dev nand_flash_ids[] = { +@@ -163,6 +163,7 @@ struct nand_flash_dev nand_flash_ids[] = {NULL} }; @@ -205,7 +198,7 @@ index dd620c1..b786718 100644 /* Manufacturer IDs */ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_TOSHIBA, "Toshiba"}, -@@ -171,7 +172,7 @@ struct nand_manufacturers nand_manuf_ids[] = { +@@ -171,7 +172,7 @@ struct nand_manufacturers nand_manuf_ids {NAND_MFR_NATIONAL, "National"}, {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, @@ -214,8 +207,6 @@ index dd620c1..b786718 100644 {NAND_MFR_MICRON, "Micron"}, {NAND_MFR_AMD, "AMD/Spansion"}, {NAND_MFR_MACRONIX, "Macronix"}, -diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h -index 5844d6f..328aab2 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -959,6 +959,8 @@ struct nand_manufacturers { |