kernel: bump 4.9 to 4.9.54
Refresh patches. Remove upstreamed patches: - ramips/0067-enable-mt7621-xhci.patch - ramips/0085-pinmux-util.patch - ramips/301-fix-rt3883.patch Compile-tested on brcm2708/bcm2708, octeon, ramips/mt7621, x86/64. Runtime-tested on brcm2708/bcm2708, octeon, ramips/mt7621, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>v19.07.3_mercusys_ac12_duma
parent
e77fa68f1f
commit
f12c42940d
@ -1,14 +0,0 @@
|
|||||||
--- a/drivers/usb/host/Kconfig
|
|
||||||
+++ b/drivers/usb/host/Kconfig
|
|
||||||
@@ -45,9 +45,9 @@ config USB_XHCI_PLATFORM
|
|
||||||
If unsure, say N.
|
|
||||||
|
|
||||||
config USB_XHCI_MTK
|
|
||||||
- tristate "xHCI support for Mediatek MT65xx"
|
|
||||||
+ tristate "xHCI support for Mediatek MT65xx/MT7621"
|
|
||||||
select MFD_SYSCON
|
|
||||||
- depends on ARCH_MEDIATEK || COMPILE_TEST
|
|
||||||
+ depends on SOC_MT7621 || ARCH_MEDIATEK || COMPILE_TEST
|
|
||||||
---help---
|
|
||||||
Say 'Y' to enable the support for the xHCI host controller
|
|
||||||
found in Mediatek MT65xx SoCs.
|
|
@ -1,77 +0,0 @@
|
|||||||
--- a/arch/mips/ralink/mt7620.c
|
|
||||||
+++ b/arch/mips/ralink/mt7620.c
|
|
||||||
@@ -176,7 +176,7 @@ static struct rt2880_pmx_func spi_cs1_gr
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func spis_grp_mt7628[] = {
|
|
||||||
FUNC("pwm_uart2", 3, 14, 4),
|
|
||||||
- FUNC("util", 2, 14, 4),
|
|
||||||
+ FUNC("utif", 2, 14, 4),
|
|
||||||
FUNC("gpio", 1, 14, 4),
|
|
||||||
FUNC("spis", 0, 14, 4),
|
|
||||||
};
|
|
||||||
@@ -190,28 +190,28 @@ static struct rt2880_pmx_func gpio_grp_m
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 30, 1),
|
|
||||||
- FUNC("util", 2, 30, 1),
|
|
||||||
+ FUNC("utif", 2, 30, 1),
|
|
||||||
FUNC("gpio", 1, 30, 1),
|
|
||||||
FUNC("p4led_kn", 0, 30, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p3led_kn_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 31, 1),
|
|
||||||
- FUNC("util", 2, 31, 1),
|
|
||||||
+ FUNC("utif", 2, 31, 1),
|
|
||||||
FUNC("gpio", 1, 31, 1),
|
|
||||||
FUNC("p3led_kn", 0, 31, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p2led_kn_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 32, 1),
|
|
||||||
- FUNC("util", 2, 32, 1),
|
|
||||||
+ FUNC("utif", 2, 32, 1),
|
|
||||||
FUNC("gpio", 1, 32, 1),
|
|
||||||
FUNC("p2led_kn", 0, 32, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p1led_kn_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 33, 1),
|
|
||||||
- FUNC("util", 2, 33, 1),
|
|
||||||
+ FUNC("utif", 2, 33, 1),
|
|
||||||
FUNC("gpio", 1, 33, 1),
|
|
||||||
FUNC("p1led_kn", 0, 33, 1),
|
|
||||||
};
|
|
||||||
@@ -232,28 +232,28 @@ static struct rt2880_pmx_func wled_kn_gr
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p4led_an_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 39, 1),
|
|
||||||
- FUNC("util", 2, 39, 1),
|
|
||||||
+ FUNC("utif", 2, 39, 1),
|
|
||||||
FUNC("gpio", 1, 39, 1),
|
|
||||||
FUNC("p4led_an", 0, 39, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p3led_an_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 40, 1),
|
|
||||||
- FUNC("util", 2, 40, 1),
|
|
||||||
+ FUNC("utif", 2, 40, 1),
|
|
||||||
FUNC("gpio", 1, 40, 1),
|
|
||||||
FUNC("p3led_an", 0, 40, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p2led_an_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 41, 1),
|
|
||||||
- FUNC("util", 2, 41, 1),
|
|
||||||
+ FUNC("utif", 2, 41, 1),
|
|
||||||
FUNC("gpio", 1, 41, 1),
|
|
||||||
FUNC("p2led_an", 0, 41, 1),
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct rt2880_pmx_func p1led_an_grp_mt7628[] = {
|
|
||||||
FUNC("jtag", 3, 42, 1),
|
|
||||||
- FUNC("util", 2, 42, 1),
|
|
||||||
+ FUNC("utif", 2, 42, 1),
|
|
||||||
FUNC("gpio", 1, 42, 1),
|
|
||||||
FUNC("p1led_an", 0, 42, 1),
|
|
||||||
};
|
|
@ -1,9 +0,0 @@
|
|||||||
--- a/arch/mips/ralink/rt3883.c
|
|
||||||
+++ b/arch/mips/ralink/rt3883.c
|
|
||||||
@@ -147,5 +147,5 @@ void prom_soc_init(struct ralink_soc_inf
|
|
||||||
|
|
||||||
rt2880_pinmux_data = rt3883_pinmux_data;
|
|
||||||
|
|
||||||
- ralink_soc == RT3883_SOC;
|
|
||||||
+ ralink_soc = RT3883_SOC;
|
|
||||||
}
|
|
Loading…
Reference in New Issue