From 2b664499cd6223b8063c648d8b1499431bc1103f Mon Sep 17 00:00:00 2001 From: Etienne Haarsma Date: Fri, 1 Dec 2017 18:26:40 +0100 Subject: kernel: bump 4.4 to 4.4.103 for 17.01 Refreshed all patches. Removed upstream ramips patches: 0101-MIPS-ralink-Fix-MT7628-pinmux.patch 0102--MIPS-ralink-Fix-typo-in-mt7628-pinmux-function.patch Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma --- ...0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch | 2 +- .../patches-4.4/0043-spi-add-mt7621-support.patch | 2 +- .../0101-MIPS-ralink-Fix-MT7628-pinmux.patch | 33 ---------------------- ...-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function | 31 -------------------- 4 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 target/linux/ramips/patches-4.4/0101-MIPS-ralink-Fix-MT7628-pinmux.patch delete mode 100644 target/linux/ramips/patches-4.4/0102--MIPS-ralink-Fix-typo-in-mt7628-pinmux-function (limited to 'target/linux/ramips/patches-4.4') diff --git a/target/linux/ramips/patches-4.4/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch b/target/linux/ramips/patches-4.4/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch index 6426326..f79f2cf 100644 --- a/target/linux/ramips/patches-4.4/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch +++ b/target/linux/ramips/patches-4.4/0042-SPI-ralink-add-Ralink-SoC-spi-driver.patch @@ -16,7 +16,7 @@ Acked-by: John Crispin --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -477,6 +477,12 @@ config SPI_QUP +@@ -478,6 +478,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.4/0043-spi-add-mt7621-support.patch b/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch index 8a78bda..13936b2 100644 --- a/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch +++ b/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -483,6 +483,12 @@ config SPI_RT2880 +@@ -484,6 +484,12 @@ config SPI_RT2880 help This selects a driver for the Ralink RT288x/RT305x SPI Controller. diff --git a/target/linux/ramips/patches-4.4/0101-MIPS-ralink-Fix-MT7628-pinmux.patch b/target/linux/ramips/patches-4.4/0101-MIPS-ralink-Fix-MT7628-pinmux.patch deleted file mode 100644 index f2d1ab1..0000000 --- a/target/linux/ramips/patches-4.4/0101-MIPS-ralink-Fix-MT7628-pinmux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8ef4b43cd3794d63052d85898e42424fd3b14d24 Mon Sep 17 00:00:00 2001 -From: Mathias Kresin -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 -Acked-by: John Crispin -Cc: Ralf Baechle -Cc: linux-mips@linux-mips.org -Cc: # 3.19+ -Patchwork: https://patchwork.linux-mips.org/patch/16046/ -Signed-off-by: James Hogan ---- - 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.4/0102--MIPS-ralink-Fix-typo-in-mt7628-pinmux-function b/target/linux/ramips/patches-4.4/0102--MIPS-ralink-Fix-typo-in-mt7628-pinmux-function deleted file mode 100644 index 9c77840..0000000 --- a/target/linux/ramips/patches-4.4/0102--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 -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 -Acked-by: John Crispin -Cc: Ralf Baechle -Cc: linux-mips@linux-mips.org -Cc: # 3.19+ -Patchwork: https://patchwork.linux-mips.org/patch/16047/ -Signed-off-by: James Hogan ---- - 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) }; -- cgit v1.1