aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.9
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-12-06 23:51:31 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-12-07 01:41:09 +0200
commitf9974786551750ea47cd1faf1e739d6a39ec2dc7 (patch)
tree6fe2f55dbba4fd5770307280c98d1d7f3544a15e /target/linux/ramips/patches-4.9
parent79a19e5d27db21d2fe9a5c14f8fad365fca9b831 (diff)
downloadupstream-f9974786551750ea47cd1faf1e739d6a39ec2dc7.tar.gz
upstream-f9974786551750ea47cd1faf1e739d6a39ec2dc7.tar.bz2
upstream-f9974786551750ea47cd1faf1e739d6a39ec2dc7.zip
kernel: bump 4.9 to 4.9.67
Refresh patches. Remove upstreamed patches: - generic/190-1-5-e1000e-Fix-error-path-in-link-detection.patch - generic/190-3-5-e1000e-Fix-return-value-test.patch - generic/190-4-5-e1000e-Separate-signaling-for-link-check-link-up.patch - generic/190-5-5-e1000e-Avoid-receiver-overrun-interrupt-bursts.patch - ramips/0102-MIPS-ralink-Fix-MT7628-pinmux.patch - ramips/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function Update patches that no longer apply: - layerscape/815-spi-support-layerscape.patch - ramips/0099-pci-mt7620.patch Compile-tested on ar71xx, brcm2708/bcm2708, octeon and x86/64. Runtime-tested on ar71xx, brcm2708/bcm2708, octeon and x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ramips/patches-4.9')
-rw-r--r--target/linux/ramips/patches-4.9/0040-nand-hack.patch4
-rw-r--r--target/linux/ramips/patches-4.9/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch2
-rw-r--r--target/linux/ramips/patches-4.9/0043-spi-add-mt7621-support.patch2
-rw-r--r--target/linux/ramips/patches-4.9/0099-pci-mt7620.patch9
-rw-r--r--target/linux/ramips/patches-4.9/0102-MIPS-ralink-Fix-MT7628-pinmux.patch33
-rw-r--r--target/linux/ramips/patches-4.9/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function31
-rw-r--r--target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch4
7 files changed, 6 insertions, 79 deletions
diff --git a/target/linux/ramips/patches-4.9/0040-nand-hack.patch b/target/linux/ramips/patches-4.9/0040-nand-hack.patch
index fe2b12d2ce..e0bd5f6026 100644
--- a/target/linux/ramips/patches-4.9/0040-nand-hack.patch
+++ b/target/linux/ramips/patches-4.9/0040-nand-hack.patch
@@ -18,7 +18,7 @@
if (ret < 0) {
if (use_bufpoi)
/* Invalidate page cache */
-@@ -3203,8 +3207,11 @@ int nand_erase_nand(struct mtd_info *mtd
+@@ -3206,8 +3210,11 @@ int nand_erase_nand(struct mtd_info *mtd
(page + pages_per_block))
chip->pagebuf = -1;
@@ -31,7 +31,7 @@
/*
* See if operation failed and additional status checks are
* available
-@@ -4398,6 +4405,7 @@ int nand_scan_ident(struct mtd_info *mtd
+@@ -4401,6 +4408,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
*/
diff --git a/target/linux/ramips/patches-4.9/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch b/target/linux/ramips/patches-4.9/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch
index 0288b97556..3150dd8382 100644
--- a/target/linux/ramips/patches-4.9/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch
+++ b/target/linux/ramips/patches-4.9/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch
@@ -16,7 +16,7 @@ Acked-by: John Crispin <blogic@openwrt.org>
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -533,6 +533,12 @@ config SPI_QUP
+@@ -534,6 +534,12 @@ config SPI_QUP
This driver can also be built as a module. If so, the module
will be called spi_qup.
diff --git a/target/linux/ramips/patches-4.9/0043-spi-add-mt7621-support.patch b/target/linux/ramips/patches-4.9/0043-spi-add-mt7621-support.patch
index 339dc5a87d..984f4ada9e 100644
--- a/target/linux/ramips/patches-4.9/0043-spi-add-mt7621-support.patch
+++ b/target/linux/ramips/patches-4.9/0043-spi-add-mt7621-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -539,6 +539,12 @@ config SPI_RT2880
+@@ -540,6 +540,12 @@ config SPI_RT2880
help
This selects a driver for the Ralink RT288x/RT305x SPI Controller.
diff --git a/target/linux/ramips/patches-4.9/0099-pci-mt7620.patch b/target/linux/ramips/patches-4.9/0099-pci-mt7620.patch
index f532f30db8..997fb6a2b3 100644
--- a/target/linux/ramips/patches-4.9/0099-pci-mt7620.patch
+++ b/target/linux/ramips/patches-4.9/0099-pci-mt7620.patch
@@ -8,12 +8,3 @@
#define PPLL_DRV 0xa0
#define PDRV_SW_SET (1<<31)
-@@ -121,7 +120,7 @@ static int wait_pciephy_busy(void)
- else
- break;
- if (retry++ > WAITRETRY_MAX) {
-- printk(KERN_WARN "PCIE-PHY retry failed.\n");
-+ pr_warn("PCIE-PHY retry failed.\n");
- return -1;
- }
- }
diff --git a/target/linux/ramips/patches-4.9/0102-MIPS-ralink-Fix-MT7628-pinmux.patch b/target/linux/ramips/patches-4.9/0102-MIPS-ralink-Fix-MT7628-pinmux.patch
deleted file mode 100644
index f2d1ab1706..0000000000
--- a/target/linux/ramips/patches-4.9/0102-MIPS-ralink-Fix-MT7628-pinmux.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8ef4b43cd3794d63052d85898e42424fd3b14d24 Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <dev@kresin.me>
-Date: Thu, 11 May 2017 08:11:14 +0200
-Subject: [PATCH 1/2] MIPS: ralink: Fix MT7628 pinmux
-
-According to the datasheet the REFCLK pin is shared with GPIO#37 and
-the PERST pin is shared with GPIO#36.
-
-Fixes: 53263a1c6852 ("MIPS: ralink: add mt7628an support")
-Signed-off-by: Mathias Kresin <dev@kresin.me>
-Acked-by: John Crispin <john@phrozen.org>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: linux-mips@linux-mips.org
-Cc: <stable@vger.kernel.org> # 3.19+
-Patchwork: https://patchwork.linux-mips.org/patch/16046/
-Signed-off-by: James Hogan <jhogan@kernel.org>
----
- arch/mips/ralink/mt7620.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/mips/ralink/mt7620.c
-+++ b/arch/mips/ralink/mt7620.c
-@@ -141,8 +141,8 @@ static struct rt2880_pmx_func i2c_grp_mt
- FUNC("i2c", 0, 4, 2),
- };
-
--static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) };
--static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) };
-+static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 37, 1) };
-+static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 36, 1) };
- static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
- static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
-
diff --git a/target/linux/ramips/patches-4.9/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function b/target/linux/ramips/patches-4.9/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function
deleted file mode 100644
index 9c77840f2c..0000000000
--- a/target/linux/ramips/patches-4.9/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function
+++ /dev/null
@@ -1,31 +0,0 @@
-From 05a67cc258e75ac9758e6f13d26337b8be51162a Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <dev@kresin.me>
-Date: Thu, 11 May 2017 08:11:15 +0200
-Subject: [PATCH 2/2] MIPS: ralink: Fix typo in mt7628 pinmux function
-
-There is a typo inside the pinmux setup code. The function is called
-refclk and not reclk.
-
-Fixes: 53263a1c6852 ("MIPS: ralink: add mt7628an support")
-Signed-off-by: Mathias Kresin <dev@kresin.me>
-Acked-by: John Crispin <john@phrozen.org>
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: linux-mips@linux-mips.org
-Cc: <stable@vger.kernel.org> # 3.19+
-Patchwork: https://patchwork.linux-mips.org/patch/16047/
-Signed-off-by: James Hogan <jhogan@kernel.org>
----
- arch/mips/ralink/mt7620.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/mips/ralink/mt7620.c
-+++ b/arch/mips/ralink/mt7620.c
-@@ -141,7 +141,7 @@ static struct rt2880_pmx_func i2c_grp_mt
- FUNC("i2c", 0, 4, 2),
- };
-
--static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 37, 1) };
-+static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("refclk", 0, 37, 1) };
- static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 36, 1) };
- static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
- static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
diff --git 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
index 4edc7416a7..daaa0aca65 100644
--- 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
-@@ -3850,6 +3850,7 @@ static void nand_decode_ext_id(struct mt
+@@ -3853,6 +3853,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)
*
-@@ -3947,6 +3948,19 @@ static void nand_decode_ext_id(struct mt
+@@ -3950,6 +3951,19 @@ static void nand_decode_ext_id(struct mt
*busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
/*