kernel: update kernel 4.9 to 4.9.31

Fixes the following security vulnerabilities: CVE-2017-8890 The inet_csk_clone_lock function in net/ipv4/inet_connection_sock.c in the Linux kernel through 4.10.15 allows attackers to cause a denial of service (double free) or possibly have unspecified other impact by leveraging use of the accept system call. CVE-2017-9074 The IPv6 fragmentation implementation in the Linux kernel through 4.11.1 does not consider that the nexthdr field may be associated with an invalid option, which allows local users to cause a denial of service (out-of-bounds read and BUG) or possibly have unspecified other impact via crafted socket and send system calls. CVE-2017-9075 The sctp_v6_create_accept_sk function in net/sctp/ipv6.c in the Linux kernel through 4.11.1 mishandles inheritance, which allows local users to cause a denial of service or possibly have unspecified other impact via crafted system calls, a related issue to CVE-2017-8890. CVE-2017-9076 The dccp_v6_request_recv_sock function in net/dccp/ipv6.c in the Linux kernel through 4.11.1 mishandles inheritance, which allows local users to cause a denial of service or possibly have unspecified other impact via crafted system calls, a related issue to CVE-2017-8890. CVE-2017-9077 The tcp_v6_syn_recv_sock function in net/ipv6/tcp_ipv6.c in the Linux kernel through 4.11.1 mishandles inheritance, which allows local users to cause a denial of service or possibly have unspecified other impact via crafted system calls, a related issue to CVE-2017-8890. CVE-2017-9242 The __ip6_append_data function in net/ipv6/ip6_output.c in the Linux kernel through 4.11.3 is too late in checking whether an overwrite of an skb data structure may occur, which allows local users to cause a denial of service (system crash) via crafted system calls. Ref: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8890 Ref: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9074 Ref: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9075 Ref: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9076 Ref: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9077 Ref: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9242 Ref: https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.9.31 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-06-08 00:24:27 +02:00 · 2017-06-08 00:24:27 +02:00 · 55623a9c83
parent b9600b8542
commit 55623a9c83
21 changed files with 701 additions and 790 deletions
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@ -4,11 +4,11 @@ LINUX_RELEASE?=1

 LINUX_VERSION-3.18 = .43
 LINUX_VERSION-4.4 = .71
-LINUX_VERSION-4.9 = .30
+LINUX_VERSION-4.9 = .31

 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
 LINUX_KERNEL_HASH-4.4.71 = 44cd5532d6df32197fd0f89e6f8c542fcfb76b52155a4d3a609ef4898522e6ab
-LINUX_KERNEL_HASH-4.9.30 = 4272ef025ce8cd717c9291b5cbe587e13c15901d8c26ceebc471af3a1d730bbb
+LINUX_KERNEL_HASH-4.9.31 = 28cad8b66216da2550155b7a77f37041bde40b821567d1b288e5e9fb6cca9856

 ifdef KERNEL_PATCHVER
  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
--- a/target/linux/brcm2708/patches-4.9/950-0005-mm-Remove-the-PFN-busy-warning.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0005-mm-Remove-the-PFN-busy-warning.patch
@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>

 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7324,8 +7324,6 @@ int alloc_contig_range(unsigned long sta
+@@ -7335,8 +7335,6 @@ int alloc_contig_range(unsigned long sta
 
 	/* Make sure the range is really isolated. */
 	if (test_pages_isolated(outer_start, end, false)) {
--- a/target/linux/generic/patches-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ b/target/linux/generic/patches-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@ -75,7 +75,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>

 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -5894,7 +5894,7 @@ static void __ref alloc_node_mem_map(str
+@@ -5905,7 +5905,7 @@ static void __ref alloc_node_mem_map(str
 		mem_map = NODE_DATA(0)->node_mem_map;
 #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
 		if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
--- a/target/linux/generic/patches-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/patches-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 static void rt_fibinfo_free(struct rtable __rcu **rtp)
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2394,6 +2394,7 @@ static const char *const rtn_type_names[
+@@ -2396,6 +2396,7 @@ static const char *const rtn_type_names[
 	[RTN_THROW] = "THROW",
 	[RTN_NAT] = "NAT",
 	[RTN_XRESOLVE] = "XRESOLVE",
--- a/target/linux/generic/patches-4.9/901-debloat_sock_diag.patch
+++ b/target/linux/generic/patches-4.9/901-debloat_sock_diag.patch
@ -25,7 +25,7 @@
 obj-$(CONFIG_PROC_FS) += net-procfs.o
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -1460,9 +1460,11 @@ void sk_destruct(struct sock *sk)
+@@ -1457,9 +1457,11 @@ void sk_destruct(struct sock *sk)
 
 static void __sk_free(struct sock *sk)
 {
--- a/target/linux/generic/patches-4.9/902-debloat_proc.patch
+++ b/target/linux/generic/patches-4.9/902-debloat_proc.patch
@ -173,7 +173,7 @@
 		goto err;
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -3089,6 +3089,8 @@ static __net_initdata struct pernet_oper
+@@ -3082,6 +3082,8 @@ static __net_initdata struct pernet_oper
 
 static int __init proto_init(void)
 {
@ -184,7 +184,7 @@
 
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2665,10 +2665,12 @@ static const struct file_operations fib_
+@@ -2667,10 +2667,12 @@ static const struct file_operations fib_
 
 int __net_init fib_proc_init(struct net *net)
 {
@ -199,7 +199,7 @@
 			 &fib_triestat_fops))
 		goto out2;
 
-@@ -2678,17 +2680,21 @@ int __net_init fib_proc_init(struct net
+@@ -2680,17 +2682,21 @@ int __net_init fib_proc_init(struct net
 	return 0;
 
 out3:
--- a/target/linux/ipq806x/patches-4.9/852-ipq4019-pinctrl-Updated-various-Pin-definitions.patch
+++ b/target/linux/ipq806x/patches-4.9/852-ipq4019-pinctrl-Updated-various-Pin-definitions.patch
@ -10,13 +10,11 @@ Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
 drivers/pinctrl/qcom/pinctrl-ipq4019.c | 1189 +++++++++++++++++++++++++++++---
 1 file changed, 1111 insertions(+), 78 deletions(-)

-diff --git a/drivers/pinctrl/qcom/pinctrl-ipq4019.c b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
-index 743d1f4..571eb51 100644
 --- a/drivers/pinctrl/qcom/pinctrl-ipq4019.c
 +++ b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
@@ -276,16 +276,531 @@ DECLARE_QCA_GPIO_PINS(99);
-
-
+ 
+ 
 enum ipq4019_functions {
 +	qca_mux_rmii0_refclk,
 +	qca_mux_wifi0_rfsilient0,
@ -122,7 +120,7 @@ index 743d1f4..571eb51 100644
 +	qca_mux_wifi034,
 +	qca_mux_wifi134,
 +	qca_mux_jtag_tdi,
-	qca_mux_gpio,
+ 	qca_mux_gpio,
 +	qca_mux_i2s_rx_bclk,
 +	qca_mux_jtag_tck,
 +	qca_mux_i2s_rx_fsync,
@ -139,7 +137,7 @@ index 743d1f4..571eb51 100644
 +	qca_mux_mdc,
 +	qca_mux_wcss0_dbg19,
 +	qca_mux_wcss1_dbg19,
-	qca_mux_blsp_uart1,
+ 	qca_mux_blsp_uart1,
 +	qca_mux_wifi0_uart,
 +	qca_mux_wifi1_uart,
 +	qca_mux_smart1,
@ -149,13 +147,13 @@ index 743d1f4..571eb51 100644
 +	qca_mux_wifi1_uart0,
 +	qca_mux_wcss0_dbg21,
 +	qca_mux_wcss1_dbg21,
-	qca_mux_blsp_i2c0,
+ 	qca_mux_blsp_i2c0,
 +	qca_mux_wcss0_dbg22,
 +	qca_mux_wcss1_dbg22,
 +	qca_mux_wcss0_dbg23,
 +	qca_mux_wcss1_dbg23,
 +	qca_mux_blsp_spi0,
-	qca_mux_blsp_i2c1,
+ 	qca_mux_blsp_i2c1,
 +	qca_mux_wcss0_dbg24,
 +	qca_mux_wcss1_dbg24,
 +	qca_mux_wcss0_dbg25,
@ -164,7 +162,7 @@ index 743d1f4..571eb51 100644
 +	qca_mux_wcss1_dbg26,
 +	qca_mux_wcss0_dbg,
 +	qca_mux_wcss1_dbg,
-	qca_mux_blsp_uart0,
+ 	qca_mux_blsp_uart0,
 -	qca_mux_blsp_spi1,
 -	qca_mux_blsp_spi0,
 +	qca_mux_led0,
@ -229,9 +227,9 @@ index 743d1f4..571eb51 100644
 +	qca_mux_pcie_clk1,
 +	qca_mux_led3,
 +	qca_mux_sdio_cd,
-	qca_mux_NA,
+ 	qca_mux_NA,
 };
-
+ 
 +static const char * const rmii0_refclk_groups[] = {
 +	"gpio40",
 +};
@ -546,11 +544,11 @@ index 743d1f4..571eb51 100644
 +	"gpio0",
 +};
 static const char * const gpio_groups[] = {
-	"gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7",
-	"gpio8", "gpio9", "gpio10", "gpio11", "gpio12", "gpio13", "gpio14",
-@@ -303,13 +818,103 @@ static const char * const gpio_groups[] = {
-	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96", "gpio97", "gpio98",
-	"gpio99",
+ 	"gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7",
+ 	"gpio8", "gpio9", "gpio10", "gpio11", "gpio12", "gpio13", "gpio14",
+@@ -303,13 +818,103 @@ static const char * const gpio_groups[]
+ 	"gpio92", "gpio93", "gpio94", "gpio95", "gpio96", "gpio97", "gpio98",
+ 	"gpio99",
 };
 -
 +static const char * const i2s_rx_bclk_groups[] = {
@ -605,7 +603,7 @@ index 743d1f4..571eb51 100644
 +	"gpio7", "gpio23", "gpio40",
 +};
 static const char * const blsp_uart1_groups[] = {
-	"gpio8", "gpio9", "gpio10", "gpio11",
+ 	"gpio8", "gpio9", "gpio10", "gpio11",
 };
 +static const char * const wifi0_uart_groups[] = {
 +	"gpio8", "gpio9", "gpio11", "gpio19", "gpio62",
@ -636,7 +634,7 @@ index 743d1f4..571eb51 100644
 +	"gpio9", "gpio25", "gpio42",
 +};
 static const char * const blsp_i2c0_groups[] = {
-	"gpio10", "gpio11", "gpio20", "gpio21", "gpio58", "gpio59",
+ 	"gpio10", "gpio11", "gpio20", "gpio21", "gpio58", "gpio59",
 };
 +static const char * const wcss0_dbg22_groups[] = {
 +	"gpio10", "gpio26", "gpio43",
@ -651,11 +649,11 @@ index 743d1f4..571eb51 100644
 +	"gpio11", "gpio27", "gpio44",
 +};
 static const char * const blsp_spi0_groups[] = {
-	"gpio12", "gpio13", "gpio14", "gpio15", "gpio45",
-	"gpio54", "gpio55", "gpio56", "gpio57",
-@@ -317,94 +922,582 @@ static const char * const blsp_spi0_groups[] = {
+ 	"gpio12", "gpio13", "gpio14", "gpio15", "gpio45",
+ 	"gpio54", "gpio55", "gpio56", "gpio57",
+@@ -317,94 +922,582 @@ static const char * const blsp_spi0_grou
 static const char * const blsp_i2c1_groups[] = {
-	"gpio12", "gpio13", "gpio34", "gpio35",
+ 	"gpio12", "gpio13", "gpio34", "gpio35",
 };
 +static const char * const wcss0_dbg24_groups[] = {
 +	"gpio12", "gpio28", "gpio45",
@ -682,7 +680,7 @@ index 743d1f4..571eb51 100644
 +	"gpio15",
 +};
 static const char * const blsp_uart0_groups[] = {
-	"gpio16", "gpio17", "gpio60", "gpio61",
+ 	"gpio16", "gpio17", "gpio60", "gpio61",
 };
 -static const char * const blsp_spi1_groups[] = {
 -	"gpio44", "gpio45", "gpio46", "gpio47",
@ -872,7 +870,7 @@ index 743d1f4..571eb51 100644
 +static const char * const sdio_cd_groups[] = {
 +	"gpio22",
 };
-
+ 
 static const struct msm_function ipq4019_functions[] = {
 +	FUNCTION(rmii0_refclk),
 +	FUNCTION(wifi0_rfsilient0),
@ -978,7 +976,7 @@ index 743d1f4..571eb51 100644
 +	FUNCTION(wifi034),
 +	FUNCTION(wifi134),
 +	FUNCTION(jtag_tdi),
-	FUNCTION(gpio),
+ 	FUNCTION(gpio),
 +	FUNCTION(i2s_rx_bclk),
 +	FUNCTION(jtag_tck),
 +	FUNCTION(i2s_rx_fsync),
@ -995,7 +993,7 @@ index 743d1f4..571eb51 100644
 +	FUNCTION(mdc),
 +	FUNCTION(wcss0_dbg19),
 +	FUNCTION(wcss1_dbg19),
-	FUNCTION(blsp_uart1),
+ 	FUNCTION(blsp_uart1),
 +	FUNCTION(wifi0_uart),
 +	FUNCTION(wifi1_uart),
 +	FUNCTION(smart1),
@ -1005,13 +1003,13 @@ index 743d1f4..571eb51 100644
 +	FUNCTION(wifi1_uart0),
 +	FUNCTION(wcss0_dbg21),
 +	FUNCTION(wcss1_dbg21),
-	FUNCTION(blsp_i2c0),
+ 	FUNCTION(blsp_i2c0),
 +	FUNCTION(wcss0_dbg22),
 +	FUNCTION(wcss1_dbg22),
 +	FUNCTION(wcss0_dbg23),
 +	FUNCTION(wcss1_dbg23),
 +	FUNCTION(blsp_spi0),
-	FUNCTION(blsp_i2c1),
+ 	FUNCTION(blsp_i2c1),
 +	FUNCTION(wcss0_dbg24),
 +	FUNCTION(wcss1_dbg24),
 +	FUNCTION(wcss0_dbg25),
@ -1020,7 +1018,7 @@ index 743d1f4..571eb51 100644
 +	FUNCTION(wcss1_dbg26),
 +	FUNCTION(wcss0_dbg),
 +	FUNCTION(wcss1_dbg),
-	FUNCTION(blsp_uart0),
+ 	FUNCTION(blsp_uart0),
 -	FUNCTION(blsp_spi1),
 -	FUNCTION(blsp_spi0),
 +	FUNCTION(led0),
@ -1086,7 +1084,7 @@ index 743d1f4..571eb51 100644
 +	FUNCTION(led3),
 +	FUNCTION(sdio_cd),
 };
-
+ 
 static const struct msm_pingroup ipq4019_groups[] = {
 -	PINGROUP(0, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
 -	PINGROUP(1, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
@ -1307,26 +1305,24 @@ index 743d1f4..571eb51 100644
 +		 NA, NA, NA, NA, NA, NA),
 +	PINGROUP(69, qpic_pad, NA, wcss0_dbg, NA, NA, NA, NA, NA, NA, NA, NA,
 +		 NA, NA, NA),
-	PINGROUP(70, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
-	PINGROUP(71, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
-	PINGROUP(72, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
-@@ -433,7 +1526,8 @@ static const struct msm_pingroup ipq4019_groups[] = {
-	PINGROUP(95, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
-	PINGROUP(96, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
-	PINGROUP(97, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+ 	PINGROUP(70, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+ 	PINGROUP(71, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+ 	PINGROUP(72, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+@@ -433,7 +1526,8 @@ static const struct msm_pingroup ipq4019
+ 	PINGROUP(95, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+ 	PINGROUP(96, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+ 	PINGROUP(97, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
 -	PINGROUP(98, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
 +	PINGROUP(98, wifi034, wifi134, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA,
 +		 NA, NA),
-	PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+ 	PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
 };
-
-@@ -460,6 +1554,7 @@ static const struct of_device_id ipq4019_pinctrl_of_match[] = {
+ 
+@@ -460,6 +1554,7 @@ static const struct of_device_id ipq4019
 static struct platform_driver ipq4019_pinctrl_driver = {
-	.driver = {
-		.name = "ipq4019-pinctrl",
+ 	.driver = {
+ 		.name = "ipq4019-pinctrl",
 +		.owner = THIS_MODULE,
-		.of_match_table = ipq4019_pinctrl_of_match,
-	},
-	.probe = ipq4019_pinctrl_probe,
--
-2.7.2
+ 		.of_match_table = ipq4019_pinctrl_of_match,
+ 	},
+ 	.probe = ipq4019_pinctrl_probe,
--- a/target/linux/ipq806x/patches-4.9/859-msm-pinctrl-Add-support-to-configure-ipq40xx-GPIO_PU.patch
+++ b/target/linux/ipq806x/patches-4.9/859-msm-pinctrl-Add-support-to-configure-ipq40xx-GPIO_PU.patch
@ -32,38 +32,32 @@ Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
 drivers/pinctrl/qcom/pinctrl-msm8x74.c |  1 +
 11 files changed, 43 insertions(+), 13 deletions(-)

-diff --git a/drivers/pinctrl/qcom/pinctrl-apq8064.c b/drivers/pinctrl/qcom/pinctrl-apq8064.c
-index cd96699..63e9a7e 100644
 --- a/drivers/pinctrl/qcom/pinctrl-apq8064.c
 +++ b/drivers/pinctrl/qcom/pinctrl-apq8064.c
-@@ -597,6 +597,7 @@ static const struct msm_pinctrl_soc_data apq8064_pinctrl = {
-	.groups = apq8064_groups,
-	.ngroups = ARRAY_SIZE(apq8064_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -597,6 +597,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = apq8064_groups,
+ 	.ngroups = ARRAY_SIZE(apq8064_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int apq8064_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-apq8084.c b/drivers/pinctrl/qcom/pinctrl-apq8084.c
-index d07e8df..892250e 100644
 --- a/drivers/pinctrl/qcom/pinctrl-apq8084.c
 +++ b/drivers/pinctrl/qcom/pinctrl-apq8084.c
-@@ -1206,6 +1206,7 @@ static const struct msm_pinctrl_soc_data apq8084_pinctrl = {
-	.groups = apq8084_groups,
-	.ngroups = ARRAY_SIZE(apq8084_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -1206,6 +1206,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = apq8084_groups,
+ 	.ngroups = ARRAY_SIZE(apq8084_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int apq8084_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-ipq4019.c b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
-index 571eb51..040e03c 100644
 --- a/drivers/pinctrl/qcom/pinctrl-ipq4019.c
 +++ b/drivers/pinctrl/qcom/pinctrl-ipq4019.c
-@@ -1531,6 +1531,13 @@ static const struct msm_pingroup ipq4019_groups[] = {
-	PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
+@@ -1531,6 +1531,13 @@ static const struct msm_pingroup ipq4019
+ 	PINGROUP(99, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA),
 };
-
+ 
 +static const struct msm_pinctrl_gpio_pull ipq4019_gpio_pull = {
 +	.no_pull = 0,
 +	.pull_down = 1,
@ -72,48 +66,42 @@ index 571eb51..040e03c 100644
 +};
 +
 static const struct msm_pinctrl_soc_data ipq4019_pinctrl = {
-	.pins = ipq4019_pins,
-	.npins = ARRAY_SIZE(ipq4019_pins),
-@@ -1539,6 +1546,7 @@ static const struct msm_pinctrl_soc_data ipq4019_pinctrl = {
-	.groups = ipq4019_groups,
-	.ngroups = ARRAY_SIZE(ipq4019_groups),
-	.ngpios = 100,
+ 	.pins = ipq4019_pins,
+ 	.npins = ARRAY_SIZE(ipq4019_pins),
+@@ -1539,6 +1546,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = ipq4019_groups,
+ 	.ngroups = ARRAY_SIZE(ipq4019_groups),
+ 	.ngpios = 100,
 +	.gpio_pull = &ipq4019_gpio_pull,
 };
-
+ 
 static int ipq4019_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-ipq8064.c b/drivers/pinctrl/qcom/pinctrl-ipq8064.c
-index bcb29c0..a927251 100644
 --- a/drivers/pinctrl/qcom/pinctrl-ipq8064.c
 +++ b/drivers/pinctrl/qcom/pinctrl-ipq8064.c
-@@ -630,6 +630,7 @@ static const struct msm_pinctrl_soc_data ipq8064_pinctrl = {
-	.groups = ipq8064_groups,
-	.ngroups = ARRAY_SIZE(ipq8064_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -630,6 +630,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = ipq8064_groups,
+ 	.ngroups = ARRAY_SIZE(ipq8064_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int ipq8064_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-mdm9615.c b/drivers/pinctrl/qcom/pinctrl-mdm9615.c
-index 2b8f452..67e6b75 100644
 --- a/drivers/pinctrl/qcom/pinctrl-mdm9615.c
 +++ b/drivers/pinctrl/qcom/pinctrl-mdm9615.c
-@@ -444,6 +444,7 @@ static const struct msm_pinctrl_soc_data mdm9615_pinctrl = {
-	.groups = mdm9615_groups,
-	.ngroups = ARRAY_SIZE(mdm9615_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -444,6 +444,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = mdm9615_groups,
+ 	.ngroups = ARRAY_SIZE(mdm9615_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int mdm9615_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
-index c406b61..ae361a1 100644
 --- a/drivers/pinctrl/qcom/pinctrl-msm.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
-@@ -203,11 +203,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
-	return 0;
+@@ -203,11 +203,6 @@ static int msm_config_reg(struct msm_pin
+ 	return 0;
 }
-
+ 
 -#define MSM_NO_PULL	0
 -#define MSM_PULL_DOWN	1
 -#define MSM_KEEPER	2
@ -121,56 +109,54 @@ index c406b61..ae361a1 100644
 -
 static unsigned msm_regval_to_drive(u32 val)
 {
-	return (val + 1) * 2;
-@@ -238,16 +233,16 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
-	/* Convert register value to pinconf value */
-	switch (param) {
-	case PIN_CONFIG_BIAS_DISABLE:
+ 	return (val + 1) * 2;
+@@ -238,16 +233,16 @@ static int msm_config_group_get(struct p
+ 	/* Convert register value to pinconf value */
+ 	switch (param) {
+ 	case PIN_CONFIG_BIAS_DISABLE:
 -		arg = arg == MSM_NO_PULL;
 +		arg = arg == pctrl->soc->gpio_pull->no_pull;
-		break;
-	case PIN_CONFIG_BIAS_PULL_DOWN:
+ 		break;
+ 	case PIN_CONFIG_BIAS_PULL_DOWN:
 -		arg = arg == MSM_PULL_DOWN;
 +		arg = arg == pctrl->soc->gpio_pull->pull_down;
-		break;
-	case PIN_CONFIG_BIAS_BUS_HOLD:
+ 		break;
+ 	case PIN_CONFIG_BIAS_BUS_HOLD:
 -		arg = arg == MSM_KEEPER;
 +		arg = arg == pctrl->soc->gpio_pull->keeper;
-		break;
-	case PIN_CONFIG_BIAS_PULL_UP:
+ 		break;
+ 	case PIN_CONFIG_BIAS_PULL_UP:
 -		arg = arg == MSM_PULL_UP;
 +		arg = arg == pctrl->soc->gpio_pull->pull_up;
-		break;
-	case PIN_CONFIG_DRIVE_STRENGTH:
-		arg = msm_regval_to_drive(arg);
-@@ -304,16 +299,16 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
-		/* Convert pinconf values to register values */
-		switch (param) {
-		case PIN_CONFIG_BIAS_DISABLE:
+ 		break;
+ 	case PIN_CONFIG_DRIVE_STRENGTH:
+ 		arg = msm_regval_to_drive(arg);
+@@ -304,16 +299,16 @@ static int msm_config_group_set(struct p
+ 		/* Convert pinconf values to register values */
+ 		switch (param) {
+ 		case PIN_CONFIG_BIAS_DISABLE:
 -			arg = MSM_NO_PULL;
 +			arg = pctrl->soc->gpio_pull->no_pull;
-			break;
-		case PIN_CONFIG_BIAS_PULL_DOWN:
+ 			break;
+ 		case PIN_CONFIG_BIAS_PULL_DOWN:
 -			arg = MSM_PULL_DOWN;
 +			arg = pctrl->soc->gpio_pull->pull_down;
-			break;
-		case PIN_CONFIG_BIAS_BUS_HOLD:
+ 			break;
+ 		case PIN_CONFIG_BIAS_BUS_HOLD:
 -			arg = MSM_KEEPER;
 +			arg = pctrl->soc->gpio_pull->keeper;
-			break;
-		case PIN_CONFIG_BIAS_PULL_UP:
+ 			break;
+ 		case PIN_CONFIG_BIAS_PULL_UP:
 -			arg = MSM_PULL_UP;
 +			arg = pctrl->soc->gpio_pull->pull_up;
-			break;
-		case PIN_CONFIG_DRIVE_STRENGTH:
-			/* Check for invalid values */
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h
-index 54fdd04..090aed9 100644
+ 			break;
+ 		case PIN_CONFIG_DRIVE_STRENGTH:
+ 			/* Check for invalid values */
 --- a/drivers/pinctrl/qcom/pinctrl-msm.h
 +++ b/drivers/pinctrl/qcom/pinctrl-msm.h
@@ -98,6 +98,16 @@ struct msm_pingroup {
 };
-
+ 
 /**
 + * struct msm_pinctrl_gpio_pull - pinctrl pull value bit field descriptor
 + */
@ -192,11 +178,11 @@ index 54fdd04..090aed9 100644
 + * @gpio_pull_val: The pull value bit field descriptor.
  */
 struct msm_pinctrl_soc_data {
-	const struct pinctrl_pin_desc *pins;
+ 	const struct pinctrl_pin_desc *pins;
@@ -115,6 +126,14 @@ struct msm_pinctrl_soc_data {
-	const struct msm_pingroup *groups;
-	unsigned ngroups;
-	unsigned ngpios;
+ 	const struct msm_pingroup *groups;
+ 	unsigned ngroups;
+ 	unsigned ngpios;
 +	const struct msm_pinctrl_gpio_pull *gpio_pull;
 +};
 +
@ -206,55 +192,45 @@ index 54fdd04..090aed9 100644
 +	.keeper = 2,
 +	.pull_up = 3,
 };
-
+ 
 int msm_pinctrl_probe(struct platform_device *pdev,
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm8660.c b/drivers/pinctrl/qcom/pinctrl-msm8660.c
-index 5591d09..a8899d9 100644
 --- a/drivers/pinctrl/qcom/pinctrl-msm8660.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm8660.c
-@@ -979,6 +979,7 @@ static const struct msm_pinctrl_soc_data msm8660_pinctrl = {
-	.groups = msm8660_groups,
-	.ngroups = ARRAY_SIZE(msm8660_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -979,6 +979,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = msm8660_groups,
+ 	.ngroups = ARRAY_SIZE(msm8660_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int msm8660_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm8916.c b/drivers/pinctrl/qcom/pinctrl-msm8916.c
-index 20ebf24..c45c2bb 100644
 --- a/drivers/pinctrl/qcom/pinctrl-msm8916.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm8916.c
-@@ -967,6 +967,7 @@ static const struct msm_pinctrl_soc_data msm8916_pinctrl = {
-	.groups = msm8916_groups,
-	.ngroups = ARRAY_SIZE(msm8916_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -967,6 +967,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = msm8916_groups,
+ 	.ngroups = ARRAY_SIZE(msm8916_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int msm8916_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm8960.c b/drivers/pinctrl/qcom/pinctrl-msm8960.c
-index ed23e36..9411176 100644
 --- a/drivers/pinctrl/qcom/pinctrl-msm8960.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm8960.c
-@@ -1244,6 +1244,7 @@ static const struct msm_pinctrl_soc_data msm8960_pinctrl = {
-	.groups = msm8960_groups,
-	.ngroups = ARRAY_SIZE(msm8960_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -1244,6 +1244,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = msm8960_groups,
+ 	.ngroups = ARRAY_SIZE(msm8960_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int msm8960_pinctrl_probe(struct platform_device *pdev)
-diff --git a/drivers/pinctrl/qcom/pinctrl-msm8x74.c b/drivers/pinctrl/qcom/pinctrl-msm8x74.c
-index 9eb63d3..7740875 100644
 --- a/drivers/pinctrl/qcom/pinctrl-msm8x74.c
 +++ b/drivers/pinctrl/qcom/pinctrl-msm8x74.c
-@@ -1069,6 +1069,7 @@ static const struct msm_pinctrl_soc_data msm8x74_pinctrl = {
-	.groups = msm8x74_groups,
-	.ngroups = ARRAY_SIZE(msm8x74_groups),
-	.ngpios = NUM_GPIO_PINGROUPS,
+@@ -1069,6 +1069,7 @@ static const struct msm_pinctrl_soc_data
+ 	.groups = msm8x74_groups,
+ 	.ngroups = ARRAY_SIZE(msm8x74_groups),
+ 	.ngpios = NUM_GPIO_PINGROUPS,
 +	.gpio_pull = &msm_gpio_pull,
 };
-
+ 
 static int msm8x74_pinctrl_probe(struct platform_device *pdev)
--
-2.7.2
--- a/target/linux/ipq806x/patches-4.9/860-qcom-mtd-nand-Add-bam_dma-support-in-qcom_nand-drive.patch
+++ b/target/linux/ipq806x/patches-4.9/860-qcom-mtd-nand-Add-bam_dma-support-in-qcom_nand-drive.patch
@ -17,13 +17,11 @@ Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
 drivers/mtd/nand/qcom_nandc.c                      | 160 +++++++++++++++++----
 2 files changed, 190 insertions(+), 39 deletions(-)

-diff --git a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
-index 70dd511..9e5c9be 100644
 --- a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
 +++ b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
@@ -1,21 +1,26 @@
 * Qualcomm NAND controller
-
+ 
 Required properties:
 -- compatible:		should be "qcom,ipq806x-nand"
 +- compatible:		"qcom,ipq806x-nand" for IPQ8064 which uses
@ -33,7 +31,7 @@ index 70dd511..9e5c9be 100644
 - reg:			MMIO address range
 - clocks:		must contain core clock and always on clock
 - clock-names:		must contain "core" for the core clock and "aon" for the
-			always on clock
+ 			always on clock
 - dmas:			DMA specifier, consisting of a phandle to the ADM DMA
 -			controller node and the channel number to be used for
 -			NAND. Refer to dma.txt and qcom_adm.txt for more details
@ -57,36 +55,20 @@ index 70dd511..9e5c9be 100644
 +			controller on the given platform.
 - #address-cells:	<1> - subnodes give the chip-select number
 - #size-cells:		<0>
-
+ 
@@ -44,7 +49,7 @@ partition.txt for more detail.
 Example:
-
+ 
 nand@1ac00000 {
 -	compatible = "qcom,ebi2-nandc";
 +	compatible = "qcom,ipq806x-nand","qcom.qcom_nand";
-	reg = <0x1ac00000 0x800>;
-
-	clocks = <&gcc EBI2_CLK>,
-@@ -84,3 +89,45 @@ nand@1ac00000 {
-		};
-	};
- };
-+
-+nand@79B0000 {
-+	compatible = "qcom,ebi2-nandc-bam";
-+	reg = <0x79B0000 0x1000>;
-+
-+	clocks = <&gcc EBI2_CLK>,
-+		 <&gcc EBI2_AON_CLK>;
-+	clock-names = "core", "aon";
-+
-+	dmas = <&qpicbam 0>,
-+		<&qpicbam 1>,
-+		<&qpicbam 2>;
-+	dma-names = "tx", "rx", "cmd";
-+
-+	#address-cells = <1>;
-+	#size-cells = <0>;
+ 	reg = <0x1ac00000 0x800>;
+ 
+ 	clocks = <&gcc EBI2_CLK>,
+@@ -58,6 +63,48 @@ nand@1ac00000 {
+ 
+ 	#address-cells = <1>;
+ 	#size-cells = <0>;
 +
 +	nandcs@0 {
 +		compatible = "qcom,nandcs";
@ -113,8 +95,25 @@ index 70dd511..9e5c9be 100644
 +		};
 +	};
 +};
-diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
-index 57d483a..76a0ffc 100644
+
+nand@79B0000 {
+	compatible = "qcom,ebi2-nandc-bam";
+	reg = <0x79B0000 0x1000>;
+
+	clocks = <&gcc EBI2_CLK>,
+		 <&gcc EBI2_AON_CLK>;
+	clock-names = "core", "aon";
+
+	dmas = <&qpicbam 0>,
+		<&qpicbam 1>,
+		<&qpicbam 2>;
+	dma-names = "tx", "rx", "cmd";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+ 
+ 	nandcs@0 {
+ 		compatible = "qcom,nandcs";
 --- a/drivers/mtd/nand/qcom_nandc.c
 +++ b/drivers/mtd/nand/qcom_nandc.c
@@ -226,6 +226,7 @@ struct nandc_regs {
@ -135,16 +134,16 @@ index 57d483a..76a0ffc 100644
 + *				bam dma
 +*/
 struct qcom_nand_controller {
-	struct nand_hw_control controller;
-	struct list_head host_list;
+ 	struct nand_hw_control controller;
+ 	struct list_head host_list;
@@ -247,17 +251,28 @@ struct qcom_nand_controller {
-	struct clk *core_clk;
-	struct clk *aon_clk;
-
+ 	struct clk *core_clk;
+ 	struct clk *aon_clk;
+ 
 -	struct dma_chan *chan;
 -	unsigned int cmd_crci;
 -	unsigned int data_crci;
-	struct list_head desc_list;
+ 	struct list_head desc_list;
 +	union {
 +		struct {
 +			struct dma_chan *tx_chan;
@ -157,22 +156,22 @@ index 57d483a..76a0ffc 100644
 +			unsigned int data_crci;
 +		};
 +	};
-
-	u8		*data_buffer;
+ 
+ 	u8		*data_buffer;
 +	bool            dma_bam_enabled;
-	int		buf_size;
-	int		buf_count;
-	int		buf_start;
-
-	__le32 *reg_read_buf;
+ 	int		buf_size;
+ 	int		buf_count;
+ 	int		buf_start;
+ 
+ 	__le32 *reg_read_buf;
 +	dma_addr_t reg_read_buf_phys;
-	int reg_read_pos;
-
-	struct nandc_regs *regs;
+ 	int reg_read_pos;
+ 
+ 	struct nandc_regs *regs;
@@ -316,6 +331,17 @@ struct qcom_nand_host {
-	u32 clrreadstatus;
+ 	u32 clrreadstatus;
 };
-
+ 
 +/*
 + * This data type corresponds to the nand driver data which will be used at
 + * driver probe time
@ -186,20 +185,20 @@ index 57d483a..76a0ffc 100644
 +
 static inline struct qcom_nand_host *to_qcom_nand_host(struct nand_chip *chip)
 {
-	return container_of(chip, struct qcom_nand_host, chip);
-@@ -1893,7 +1919,7 @@ static int qcom_nand_host_setup(struct qcom_nand_host *host)
-				| wide_bus << WIDE_FLASH
-				| 1 << DEV0_CFG1_ECC_DISABLE;
-
+ 	return container_of(chip, struct qcom_nand_host, chip);
+@@ -1893,7 +1919,7 @@ static int qcom_nand_host_setup(struct q
+ 				| wide_bus << WIDE_FLASH
+ 				| 1 << DEV0_CFG1_ECC_DISABLE;
+ 
 -	host->ecc_bch_cfg = host->bch_enabled << ECC_CFG_ECC_DISABLE
 +	host->ecc_bch_cfg = !host->bch_enabled << ECC_CFG_ECC_DISABLE
-				| 0 << ECC_SW_RESET
-				| host->cw_data << ECC_NUM_DATA_BYTES
-				| 1 << ECC_FORCE_CLK_OPEN
-@@ -1942,16 +1968,46 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
-	if (!nandc->regs)
-		return -ENOMEM;
-
+ 				| 0 << ECC_SW_RESET
+ 				| host->cw_data << ECC_NUM_DATA_BYTES
+ 				| 1 << ECC_FORCE_CLK_OPEN
+@@ -1942,16 +1968,46 @@ static int qcom_nandc_alloc(struct qcom_
+ 	if (!nandc->regs)
+ 		return -ENOMEM;
+ 
 -	nandc->reg_read_buf = devm_kzalloc(nandc->dev,
 -				MAX_REG_RD * sizeof(*nandc->reg_read_buf),
 -				GFP_KERNEL);
@ -210,7 +209,7 @@ index 57d483a..76a0ffc 100644
 +					MAX_REG_RD *
 +					sizeof(*nandc->reg_read_buf),
 +					GFP_KERNEL);
-
+ 
 -	nandc->chan = dma_request_slave_channel(nandc->dev, "rxtx");
 -	if (!nandc->chan) {
 -		dev_err(nandc->dev, "failed to request slave channel\n");
@ -249,11 +248,11 @@ index 57d483a..76a0ffc 100644
 +			dev_err(nandc->dev, "failed to request cmd channel\n");
 +			return -ENODEV;
 +		}
-	}
-
-	INIT_LIST_HEAD(&nandc->desc_list);
-@@ -1964,8 +2020,35 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)
-
+ 	}
+ 
+ 	INIT_LIST_HEAD(&nandc->desc_list);
+@@ -1964,8 +2020,35 @@ static int qcom_nandc_alloc(struct qcom_
+ 
 static void qcom_nandc_unalloc(struct qcom_nand_controller *nandc)
 {
 -	dma_release_channel(nandc->chan);
@ -287,22 +286,22 @@ index 57d483a..76a0ffc 100644
 +	if (nandc->data_buffer)
 +		devm_kfree(nandc->dev, nandc->data_buffer);
 + }
-
+ 
 /* one time setup of a few nand controller registers */
 static int qcom_nandc_setup(struct qcom_nand_controller *nandc)
-@@ -2002,6 +2085,8 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc,
-	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "qcom_nand.%d", host->cs);
-	mtd->owner = THIS_MODULE;
-	mtd->dev.parent = dev;
+@@ -2002,6 +2085,8 @@ static int qcom_nand_host_init(struct qc
+ 	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "qcom_nand.%d", host->cs);
+ 	mtd->owner = THIS_MODULE;
+ 	mtd->dev.parent = dev;
 +	mtd->priv = chip;
 +	chip->priv = nandc;
-
-	chip->cmdfunc		= qcom_nandc_command;
-	chip->select_chip	= qcom_nandc_select_chip;
-@@ -2049,16 +2134,20 @@ static int qcom_nandc_parse_dt(struct platform_device *pdev)
-	struct device_node *np = nandc->dev->of_node;
-	int ret;
-
+ 
+ 	chip->cmdfunc		= qcom_nandc_command;
+ 	chip->select_chip	= qcom_nandc_select_chip;
+@@ -2049,16 +2134,20 @@ static int qcom_nandc_parse_dt(struct pl
+ 	struct device_node *np = nandc->dev->of_node;
+ 	int ret;
+ 
 -	ret = of_property_read_u32(np, "qcom,cmd-crci", &nandc->cmd_crci);
 -	if (ret) {
 -		dev_err(nandc->dev, "command CRCI unspecified\n");
@ -315,7 +314,7 @@ index 57d483a..76a0ffc 100644
 +			dev_err(nandc->dev, "command CRCI unspecified\n");
 +			return ret;
 +		}
-
+ 
 -	ret = of_property_read_u32(np, "qcom,data-crci", &nandc->data_crci);
 -	if (ret) {
 -		dev_err(nandc->dev, "data CRCI unspecified\n");
@ -326,33 +325,33 @@ index 57d483a..76a0ffc 100644
 +			dev_err(nandc->dev, "data CRCI unspecified\n");
 +			return ret;
 +		}
-	}
-
-	return 0;
-@@ -2073,6 +2162,7 @@ static int qcom_nandc_probe(struct platform_device *pdev)
-	struct device_node *dn = dev->of_node, *child;
-	struct resource *res;
-	int ret;
+ 	}
+ 
+ 	return 0;
+@@ -2073,6 +2162,7 @@ static int qcom_nandc_probe(struct platf
+ 	struct device_node *dn = dev->of_node, *child;
+ 	struct resource *res;
+ 	int ret;
 +	struct qcom_nand_driver_data *driver_data;
-
-	nandc = devm_kzalloc(&pdev->dev, sizeof(*nandc), GFP_KERNEL);
-	if (!nandc)
-@@ -2087,7 +2177,10 @@ static int qcom_nandc_probe(struct platform_device *pdev)
-		return -ENODEV;
-	}
-
+ 
+ 	nandc = devm_kzalloc(&pdev->dev, sizeof(*nandc), GFP_KERNEL);
+ 	if (!nandc)
+@@ -2087,7 +2177,10 @@ static int qcom_nandc_probe(struct platf
+ 		return -ENODEV;
+ 	}
+ 
 -	nandc->ecc_modes = (unsigned long)dev_data;
 +	driver_data = (struct qcom_nand_driver_data *)dev_data;
 +
 +	nandc->ecc_modes = driver_data->ecc_modes;
 +	nandc->dma_bam_enabled = driver_data->dma_bam_enabled;
-
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	nandc->base = devm_ioremap_resource(dev, res);
-@@ -2179,7 +2272,15 @@ static int qcom_nandc_remove(struct platform_device *pdev)
-	return 0;
+ 
+ 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ 	nandc->base = devm_ioremap_resource(dev, res);
+@@ -2179,7 +2272,15 @@ static int qcom_nandc_remove(struct plat
+ 	return 0;
 }
-
+ 
 -#define EBI2_NANDC_ECC_MODES	(ECC_RS_4BIT | ECC_BCH_8BIT)
 +struct qcom_nand_driver_data ebi2_nandc_bam_data = {
 +	.ecc_modes = (ECC_BCH_4BIT | ECC_BCH_8BIT),
@ -363,20 +362,18 @@ index 57d483a..76a0ffc 100644
 +	.ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT),
 +	.dma_bam_enabled = false,
 +};
-
+ 
 /*
  * data will hold a struct pointer containing more differences once we support
-@@ -2187,7 +2288,10 @@ static int qcom_nandc_remove(struct platform_device *pdev)
+@@ -2187,7 +2288,10 @@ static int qcom_nandc_remove(struct plat
  */
 static const struct of_device_id qcom_nandc_of_match[] = {
-	{	.compatible = "qcom,ipq806x-nand",
+ 	{	.compatible = "qcom,ipq806x-nand",
 -		.data = (void *)EBI2_NANDC_ECC_MODES,
 +		.data = (void *) &ebi2_nandc_data,
 +	},
 +	{	.compatible = "qcom,ebi2-nandc-bam",
 +		.data = (void *) &ebi2_nandc_bam_data,
-	},
-	{}
+ 	},
+ 	{}
 };
--
-2.7.2
--- a/target/linux/ipq806x/patches-4.9/861-qcom-mtd-nand-Added-bam-transaction-and-support-addi.patch
+++ b/target/linux/ipq806x/patches-4.9/861-qcom-mtd-nand-Added-bam-transaction-and-support-addi.patch
--- a/target/linux/ipq806x/patches-4.9/862-dmaengine-qcom-bam_dma-Add-custom-data-mapping.patch
+++ b/target/linux/ipq806x/patches-4.9/862-dmaengine-qcom-bam_dma-Add-custom-data-mapping.patch
@ -14,8 +14,6 @@ Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
 include/linux/dmaengine.h        | 14 ++++++
 3 files changed, 119 insertions(+), 6 deletions(-)

-diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c
-index 03c4eb3..bde8d70 100644
 --- a/drivers/dma/qcom/bam_dma.c
 +++ b/drivers/dma/qcom/bam_dma.c
@@ -49,6 +49,7 @@
@ -23,24 +21,24 @@ index 03c4eb3..bde8d70 100644
 #include <linux/dmaengine.h>
 #include <linux/pm_runtime.h>
 +#include <linux/dma/qcom_bam_dma.h>
-
+ 
 #include "../dmaengine.h"
 #include "../virt-dma.h"
@@ -61,11 +62,6 @@ struct bam_desc_hw {
-
+ 
 #define BAM_DMA_AUTOSUSPEND_DELAY 100
-
+ 
 -#define DESC_FLAG_INT BIT(15)
 -#define DESC_FLAG_EOT BIT(14)
 -#define DESC_FLAG_EOB BIT(13)
 -#define DESC_FLAG_NWD BIT(12)
 -
 struct bam_async_desc {
-	struct virt_dma_desc vd;
-
-@@ -670,6 +666,93 @@ static struct dma_async_tx_descriptor *bam_prep_slave_sg(struct dma_chan *chan,
+ 	struct virt_dma_desc vd;
+ 
+@@ -670,6 +666,93 @@ err_out:
 }
-
+ 
 /**
 + * bam_prep_dma_custom_mapping - Prep DMA descriptor from custom data
 + *
@ -132,31 +130,29 @@ index 03c4eb3..bde8d70 100644
  * bam_dma_terminate_all - terminate all transactions on a channel
  * @bchan: bam dma channel
  *
-@@ -960,7 +1043,7 @@ static void bam_start_dma(struct bam_chan *bchan)
-
-	/* set any special flags on the last descriptor */
-	if (async_desc->num_desc == async_desc->xfer_len)
+@@ -960,7 +1043,7 @@ static void bam_start_dma(struct bam_cha
+ 
+ 	/* set any special flags on the last descriptor */
+ 	if (async_desc->num_desc == async_desc->xfer_len)
 -		desc[async_desc->xfer_len - 1].flags =
 +		desc[async_desc->xfer_len - 1].flags |=
-					cpu_to_le16(async_desc->flags);
-	else
-		desc[async_desc->xfer_len - 1].flags |=
-@@ -1237,6 +1320,8 @@ static int bam_dma_probe(struct platform_device *pdev)
-	bdev->common.device_alloc_chan_resources = bam_alloc_chan;
-	bdev->common.device_free_chan_resources = bam_free_chan;
-	bdev->common.device_prep_slave_sg = bam_prep_slave_sg;
+ 					cpu_to_le16(async_desc->flags);
+ 	else
+ 		desc[async_desc->xfer_len - 1].flags |=
+@@ -1237,6 +1320,8 @@ static int bam_dma_probe(struct platform
+ 	bdev->common.device_alloc_chan_resources = bam_alloc_chan;
+ 	bdev->common.device_free_chan_resources = bam_free_chan;
+ 	bdev->common.device_prep_slave_sg = bam_prep_slave_sg;
 +	bdev->common.device_prep_dma_custom_mapping =
 +		bam_prep_dma_custom_mapping;
-	bdev->common.device_config = bam_slave_config;
-	bdev->common.device_pause = bam_pause;
-	bdev->common.device_resume = bam_resume;
-diff --git a/include/linux/dma/qcom_bam_dma.h b/include/linux/dma/qcom_bam_dma.h
-index 7e87a85..7113c77 100644
+ 	bdev->common.device_config = bam_slave_config;
+ 	bdev->common.device_pause = bam_pause;
+ 	bdev->common.device_resume = bam_resume;
 --- a/include/linux/dma/qcom_bam_dma.h
 +++ b/include/linux/dma/qcom_bam_dma.h
@@ -65,6 +65,19 @@ enum bam_command_type {
 };
-
+ 
 /*
 + * QCOM BAM DMA custom data
 + *
@ -174,8 +170,6 @@ index 7e87a85..7113c77 100644
  * qcom_bam_sg_init_table - Init QCOM BAM SGL
  * @bam_sgl: bam sgl
  * @nents: number of entries in bam sgl
-diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
-index cc535a4..627c125 100644
 --- a/include/linux/dmaengine.h
 +++ b/include/linux/dmaengine.h
@@ -692,6 +692,8 @@ struct dma_filter {
@ -188,19 +182,19 @@ index cc535a4..627c125 100644
  *	code
  * @device_pause: Pauses any transfer happening on a channel. Returns
@@ -783,6 +785,9 @@ struct dma_device {
-	struct dma_async_tx_descriptor *(*device_prep_dma_imm_data)(
-		struct dma_chan *chan, dma_addr_t dst, u64 data,
-		unsigned long flags);
+ 	struct dma_async_tx_descriptor *(*device_prep_dma_imm_data)(
+ 		struct dma_chan *chan, dma_addr_t dst, u64 data,
+ 		unsigned long flags);
 +	struct dma_async_tx_descriptor *(*device_prep_dma_custom_mapping)(
 +		struct dma_chan *chan, void *data,
 +		unsigned long flags);
-
-	int (*device_config)(struct dma_chan *chan,
-			     struct dma_slave_config *config);
-@@ -899,6 +904,15 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_sg(
-			src_sg, src_nents, flags);
+ 
+ 	int (*device_config)(struct dma_chan *chan,
+ 			     struct dma_slave_config *config);
+@@ -899,6 +904,15 @@ static inline struct dma_async_tx_descri
+ 			src_sg, src_nents, flags);
 }
-
+ 
 +static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_custom_mapping(
 +		struct dma_chan *chan,
 +		void *data,
@ -213,5 +207,3 @@ index cc535a4..627c125 100644
 /**
  * dmaengine_terminate_all() - Terminate all active DMA transfers
  * @chan: The channel for which to terminate the transfers
--
-2.7.2
--- a/target/linux/ipq806x/patches-4.9/863-dts-ipq4019-add-nand-and-qpic-bam-dma-node.patch
+++ b/target/linux/ipq806x/patches-4.9/863-dts-ipq4019-add-nand-and-qpic-bam-dma-node.patch
@ -13,14 +13,12 @@ Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
 arch/arm/boot/dts/qcom-ipq4019.dtsi           | 38 ++++++++++++++
 2 files changed, 113 insertions(+)

-diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
-index 09fb047..e94954e 100644
 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
-@@ -101,6 +101,86 @@
-					bias-bus-hold;
-				};
-			};
+@@ -88,6 +88,86 @@
+ 					bias-disable;
+ 				};
+ 			};
 +
 +			nand_pins: nand_pins {
 +
@ -101,13 +99,13 @@ index 09fb047..e94954e 100644
 +					bias-pull-down;
 +				};
 +			};
-		};
-
-		blsp_dma: dma@7884000 {
-@@ -204,5 +269,15 @@
-		wifi@a800000 {
-			status = "ok";
-		};
+ 		};
+ 
+ 		blsp_dma: dma@7884000 {
+@@ -159,5 +239,15 @@
+ 		watchdog@b017000 {
+ 			status = "ok";
+ 		};
 +
 +		qpic_bam: dma@7984000 {
 +			status = "ok";
@ -118,16 +116,14 @@ index 09fb047..e94954e 100644
 +			pinctrl-names = "default";
 +			status = "ok";
 +		};
-	};
+ 	};
 };
-diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-index 52a64e7..740808b 100644
 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -593,5 +593,43 @@
-					  "legacy";
-			status = "disabled";
-		};
+@@ -586,5 +586,43 @@
+ 					  "legacy";
+ 			status = "disabled";
+ 		};
 +
 +		qpic_bam: dma@7984000 {
 +			compatible = "qcom,bam-v1.7.0";
@ -166,7 +162,5 @@ index 52a64e7..740808b 100644
 +				nand-bus-width = <8>;
 +			};
 +		};
-	};
+ 	};
 };
--
-2.7.2
--- a/target/linux/mvebu/patches-4.9/432-phy-marvell-88E1512-add-flow-control-support.patch
+++ b/target/linux/mvebu/patches-4.9/432-phy-marvell-88E1512-add-flow-control-support.patch
@ -12,7 +12,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -1671,7 +1671,8 @@ static struct phy_driver marvell_drivers
+@@ -1679,7 +1679,8 @@ static struct phy_driver marvell_drivers
 		.phy_id = MARVELL_PHY_ID_88E1510,
 		.phy_id_mask = MARVELL_PHY_ID_MASK,
 		.name = "Marvell 88E1510",
--- a/target/linux/mvebu/patches-4.9/433-phy-marvell-88E1111-add-flow-control-support.patch
+++ b/target/linux/mvebu/patches-4.9/433-phy-marvell-88E1111-add-flow-control-support.patch
@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -1523,7 +1523,7 @@ static struct phy_driver marvell_drivers
+@@ -1531,7 +1531,7 @@ static struct phy_driver marvell_drivers
 		.phy_id = MARVELL_PHY_ID_88E1111,
 		.phy_id_mask = MARVELL_PHY_ID_MASK,
 		.name = "Marvell 88E1111",
--- a/target/linux/mvebu/patches-4.9/434-phy-marvell-88E1540-add-flow-control-support.patch
+++ b/target/linux/mvebu/patches-4.9/434-phy-marvell-88E1540-add-flow-control-support.patch
@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -1691,7 +1691,7 @@ static struct phy_driver marvell_drivers
+@@ -1699,7 +1699,7 @@ static struct phy_driver marvell_drivers
 		.phy_id = MARVELL_PHY_ID_88E1540,
 		.phy_id_mask = MARVELL_PHY_ID_MASK,
 		.name = "Marvell 88E1540",
--- a/target/linux/mvebu/patches-4.9/435-net-phy-fix-marvell-phy-status-reading.patch
+++ b/target/linux/mvebu/patches-4.9/435-net-phy-fix-marvell-phy-status-reading.patch
@ -15,7 +15,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -1106,8 +1106,6 @@ static int marvell_read_status_page(stru
+@@ -1114,8 +1114,6 @@ static int marvell_read_status_page(stru
 		if (adv < 0)
 			return adv;
 
--- a/target/linux/mvebu/patches-4.9/473-fix-marvell-phy-initialization-issues.patch
+++ b/target/linux/mvebu/patches-4.9/473-fix-marvell-phy-initialization-issues.patch
@ -15,7 +15,7 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>

 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -361,7 +361,7 @@ static int m88e1111_config_aneg(struct p
+@@ -369,7 +369,7 @@ static int m88e1111_config_aneg(struct p
 static int marvell_of_reg_init(struct phy_device *phydev)
 {
 	const __be32 *paddr;
@ -24,7 +24,7 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
 
 	if (!phydev->mdio.dev.of_node)
 		return 0;
-@@ -374,7 +374,6 @@ static int marvell_of_reg_init(struct ph
+@@ -382,7 +382,6 @@ static int marvell_of_reg_init(struct ph
 	saved_page = phy_read(phydev, MII_MARVELL_PHY_PAGE);
 	if (saved_page < 0)
 		return saved_page;
@ -32,7 +32,7 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
 	current_page = saved_page;
 
 	ret = 0;
-@@ -388,7 +387,6 @@ static int marvell_of_reg_init(struct ph
+@@ -396,7 +395,6 @@ static int marvell_of_reg_init(struct ph
 
 		if (reg_page != current_page) {
 			current_page = reg_page;
@ -40,7 +40,7 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
 			ret = phy_write(phydev, MII_MARVELL_PHY_PAGE, reg_page);
 			if (ret < 0)
 				goto err;
-@@ -411,7 +409,7 @@ static int marvell_of_reg_init(struct ph
+@@ -419,7 +417,7 @@ static int marvell_of_reg_init(struct ph
 
 	}
 err:
@ -49,7 +49,7 @@ Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
 		i = phy_write(phydev, MII_MARVELL_PHY_PAGE, saved_page);
 		if (ret == 0)
 			ret = i;
-@@ -1192,7 +1190,8 @@ static int marvell_read_status(struct ph
+@@ -1200,7 +1198,8 @@ static int marvell_read_status(struct ph
 	int err;
 
 	/* Check the fiber mode first */
--- a/target/linux/ramips/patches-4.9/0009-PCI-MIPS-enable-PCIe-on-MT7688.patch
+++ b/target/linux/ramips/patches-4.9/0009-PCI-MIPS-enable-PCIe-on-MT7688.patch
@ -16,11 +16,9 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 arch/mips/pci/pci-mt7620.c | 1 +
 1 file changed, 1 insertion(+)

-diff --git a/arch/mips/pci/pci-mt7620.c b/arch/mips/pci/pci-mt7620.c
-index 628c5132b3d8..cd8e2b87efd5 100644
 --- a/arch/mips/pci/pci-mt7620.c
 +++ b/arch/mips/pci/pci-mt7620.c
-@@ -316,6 +316,7 @@ static int mt7620_pci_probe(struct platform_device *pdev)
+@@ -316,6 +316,7 @@ static int mt7620_pci_probe(struct platf
 		break;
 
 	case MT762X_SOC_MT7628AN:
@ -28,6 +26,3 @@ index 628c5132b3d8..cd8e2b87efd5 100644
 		if (mt7628_pci_hw_init(pdev))
 			return -1;
 		break;
-- 
-2.13.0
-
--- a/target/linux/ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch
+++ b/target/linux/ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch
@ -29,10 +29,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 create mode 100644 drivers/mtd/nand/nand_device_list.h
 create mode 100644 drivers/mtd/nand/partition.h

-Index: linux-4.9.30/drivers/mtd/nand/Kconfig
-===================================================================
--- linux-4.9.30.orig/drivers/mtd/nand/Kconfig
-+++ linux-4.9.30/drivers/mtd/nand/Kconfig
+--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -569,4 +569,10 @@ config MTD_NAND_MTK
 	  Enables support for NAND controller on MTK SoCs.
 	  This controller is found on mt27xx, mt81xx, mt65xx SoCs.
@ -44,10 +42,8 @@ Index: linux-4.9.30/drivers/mtd/nand/Kconfig
 +	select MTD_NAND_ECC
 +
 endif # MTD_NAND
-Index: linux-4.9.30/drivers/mtd/nand/Makefile
-===================================================================
--- linux-4.9.30.orig/drivers/mtd/nand/Makefile
-+++ linux-4.9.30/drivers/mtd/nand/Makefile
+--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -58,5 +58,6 @@ obj-$(CONFIG_MTD_NAND_HISI504)	        +
 obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= brcmnand/
 obj-$(CONFIG_MTD_NAND_QCOM)		+= qcom_nandc.o
@ -55,10 +51,8 @@ Index: linux-4.9.30/drivers/mtd/nand/Makefile
 +obj-$(CONFIG_MTK_MTD_NAND)		+= mtk_nand2.o bmt.o
 
 nand-objs := nand_base.o nand_bbt.o nand_timings.o
-Index: linux-4.9.30/drivers/mtd/nand/bmt.c
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/bmt.c
+++ b/drivers/mtd/nand/bmt.c
@@ -0,0 +1,750 @@
 +#include "bmt.h"
 +
@ -810,10 +804,8 @@ Index: linux-4.9.30/drivers/mtd/nand/bmt.c
 +MODULE_AUTHOR("MediaTek");
 +MODULE_DESCRIPTION("Bad Block mapping management for MediaTek NAND Flash Driver");
 +#endif
-Index: linux-4.9.30/drivers/mtd/nand/bmt.h
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/bmt.h
+++ b/drivers/mtd/nand/bmt.h
@@ -0,0 +1,80 @@
 +#ifndef __BMT_H__
 +#define __BMT_H__
@ -895,10 +887,8 @@ Index: linux-4.9.30/drivers/mtd/nand/bmt.h
 +unsigned short get_mapping_block_index(int index);
 +
 +#endif                          // #ifndef __BMT_H__
-Index: linux-4.9.30/drivers/mtd/nand/dev-nand.c
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/dev-nand.c
+++ b/drivers/mtd/nand/dev-nand.c
@@ -0,0 +1,63 @@
 +#include <linux/init.h>
 +#include <linux/kernel.h>
@ -963,10 +953,8 @@ Index: linux-4.9.30/drivers/mtd/nand/dev-nand.c
 +	return retval;
 +}
 +arch_initcall(mtk_nand_register);
-Index: linux-4.9.30/drivers/mtd/nand/mt6575_typedefs.h
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/mt6575_typedefs.h
+++ b/drivers/mtd/nand/mt6575_typedefs.h
@@ -0,0 +1,340 @@
 +/* Copyright Statement:
 + *
@ -1308,10 +1296,8 @@ Index: linux-4.9.30/drivers/mtd/nand/mt6575_typedefs.h
 +
 +#endif  // _MT6575_TYPEDEFS_H
 +
-Index: linux-4.9.30/drivers/mtd/nand/mtk_nand2.c
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/mtk_nand2.c
+++ b/drivers/mtd/nand/mtk_nand2.c
@@ -0,0 +1,2363 @@
 +/******************************************************************************
 +* mtk_nand2.c - MTK NAND Flash Device Driver
@ -3676,10 +3662,8 @@ Index: linux-4.9.30/drivers/mtd/nand/mtk_nand2.c
 +module_init(mtk_nand_init);
 +module_exit(mtk_nand_exit);
 +MODULE_LICENSE("GPL");
-Index: linux-4.9.30/drivers/mtd/nand/mtk_nand2.h
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/mtk_nand2.h
+++ b/drivers/mtd/nand/mtk_nand2.h
@@ -0,0 +1,452 @@
 +#ifndef __MTK_NAND_H
 +#define __MTK_NAND_H
@ -4133,10 +4117,8 @@ Index: linux-4.9.30/drivers/mtd/nand/mtk_nand2.h
 +extern u32	CFG_BLOCKSIZE;
 +#endif
 +#endif
-Index: linux-4.9.30/drivers/mtd/nand/nand_base.c
-===================================================================
--- linux-4.9.30.orig/drivers/mtd/nand/nand_base.c
-+++ linux-4.9.30/drivers/mtd/nand/nand_base.c
+--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -47,7 +47,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
@ -4164,10 +4146,8 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_base.c
 nand_get_device(struct mtd_info *mtd, int new_state)
 {
 	struct nand_chip *chip = mtd_to_nand(mtd);
-Index: linux-4.9.30/drivers/mtd/nand/nand_bbt.c
-===================================================================
--- linux-4.9.30.orig/drivers/mtd/nand/nand_bbt.c
-+++ linux-4.9.30/drivers/mtd/nand/nand_bbt.c
+--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -1215,6 +1215,25 @@ err:
 	return res;
 }
@ -4194,10 +4174,8 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_bbt.c
 /**
  * nand_update_bbt - update bad block table(s)
  * @mtd: MTD device structure
-Index: linux-4.9.30/drivers/mtd/nand/nand_def.h
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/nand_def.h
+++ b/drivers/mtd/nand/nand_def.h
@@ -0,0 +1,123 @@
 +#ifndef __NAND_DEF_H__
 +#define __NAND_DEF_H__
@ -4322,10 +4300,8 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_def.h
 +#include "mt6575_typedefs.h"
 +
 +#endif /* __NAND_DEF_H__ */
-Index: linux-4.9.30/drivers/mtd/nand/nand_device_list.h
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/nand_device_list.h
+++ b/drivers/mtd/nand/nand_device_list.h
@@ -0,0 +1,55 @@
 +/* Copyright Statement:
 + *
@ -4382,10 +4358,8 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_device_list.h
 +
 +
 +#endif
-Index: linux-4.9.30/drivers/mtd/nand/partition.h
-===================================================================
 --- /dev/null
-+++ linux-4.9.30/drivers/mtd/nand/partition.h
+++ b/drivers/mtd/nand/partition.h
@@ -0,0 +1,115 @@
 +/* Copyright Statement:
 + *
--- a/target/linux/ramips/patches-4.9/0040-nand-hack.patch
+++ b/target/linux/ramips/patches-4.9/0040-nand-hack.patch
@ -1,7 +1,5 @@
-Index: linux-4.9.30/drivers/mtd/nand/nand_base.c
-===================================================================
--- linux-4.9.30.orig/drivers/mtd/nand/nand_base.c
-+++ linux-4.9.30/drivers/mtd/nand/nand_base.c
+--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2014,6 +2014,9 @@ static int nand_do_read_ops(struct mtd_i
 						 __func__, buf);
 
@ -33,7 +31,7 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_base.c
 		/*
 		 * See if operation failed and additional status checks are
 		 * available
-@@ -4404,6 +4411,7 @@ int nand_scan_ident(struct mtd_info *mtd
+@@ -4390,6 +4397,7 @@ int nand_scan_ident(struct mtd_info *mtd
 		 * cmdfunc() both expect cmd_ctrl() to be populated,
 		 * so we need to check that that's the case
 		 */
@ -41,10 +39,8 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_base.c
 		pr_err("chip.cmd_ctrl() callback is not provided");
 		return -EINVAL;
 	}
-Index: linux-4.9.30/drivers/mtd/nand/nand_device_list.h
-===================================================================
--- linux-4.9.30.orig/drivers/mtd/nand/nand_device_list.h
-+++ linux-4.9.30/drivers/mtd/nand/nand_device_list.h
+--- a/drivers/mtd/nand/nand_device_list.h
+++ b/drivers/mtd/nand/nand_device_list.h
@@ -43,6 +43,8 @@ static const flashdev_info gen_FlashTabl
 	{0xADBC, 0x905554, 5, 16, 512, 128, 2048, 64, 0x10801011, "H9DA4GH4JJAMC", 0},
     {0x01F1, 0x801D01, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "S34ML01G100TF", 0},
@ -54,10 +50,8 @@ Index: linux-4.9.30/drivers/mtd/nand/nand_device_list.h
 	{0xECD3, 0x519558, 5, 8, 1024, 128, 2048, 64, 0x44333, "K9K8G8000", 0},
     {0xC2F1, 0x801DC2, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "MX30LF1G08AA", 0},
     {0x98D3, 0x902676, 5, 8, 1024, 256, 4096, 224, 0x00C25332, "TC58NVG3S0F", 0},
-Index: linux-4.9.30/include/linux/mtd/nand.h
-===================================================================
--- linux-4.9.30.orig/include/linux/mtd/nand.h
-+++ linux-4.9.30/include/linux/mtd/nand.h
+--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -825,6 +825,10 @@ struct nand_chip {
 				    const struct nand_data_interface *conf,
 				    bool check_only);
--- a/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch
+++ b/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch
@ -13,7 +13,7 @@ Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>

 --- a/drivers/mtd/nand/nand_base.c
 +++ b/drivers/mtd/nand/nand_base.c
-@@ -3835,6 +3835,7 @@ static void nand_decode_ext_id(struct mt
+@@ -3842,6 +3842,7 @@ static void nand_decode_ext_id(struct mt
 	/*
 	 * Field definitions are in the following datasheets:
 	 * Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32)
@ -21,7 +21,7 @@ Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
 	 * New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44)
 	 * Hynix MLC   (6 byte ID): Hynix H27UBG8T2B (p.22)
 	 *
-@@ -3932,6 +3933,19 @@ static void nand_decode_ext_id(struct mt
+@@ -3939,6 +3940,19 @@ static void nand_decode_ext_id(struct mt
 		*busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
 
 		/*