kernel: 5.10: refresh generic and rockchip patches

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-03-05 16:32:13 +08:00
parent 4e103584ce
commit 7fe6f5b9fa
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
8 changed files with 11 additions and 11 deletions

View File

@ -93,7 +93,7 @@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2743,6 +2743,9 @@ int nf_conntrack_init_net(struct net *ne
@@ -2744,6 +2744,9 @@ int nf_conntrack_init_net(struct net *ne
nf_conntrack_helper_pernet_init(net);
nf_conntrack_proto_pernet_init(net);

View File

@ -98,7 +98,7 @@
len = skb->len;
PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
@@ -5106,6 +5115,11 @@ void netdev_rx_handler_unregister(struct
@@ -5108,6 +5117,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
@ -110,7 +110,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5154,6 +5168,10 @@ static int __netif_receive_skb_core(stru
@@ -5156,6 +5170,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;
@ -121,7 +121,7 @@
net_timestamp_check(!netdev_tstamp_prequeue, skb);
trace_netif_receive_skb(skb);
@@ -5193,6 +5211,16 @@ another_round:
@@ -5195,6 +5213,16 @@ another_round:
goto out;
}

View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1349,6 +1349,7 @@ static const struct usb_device_id produc
@@ -1350,6 +1350,7 @@ static const struct usb_device_id produc
{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */

View File

@ -14,7 +14,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -134,6 +134,8 @@
@@ -138,6 +138,8 @@
#size-cells = <0>;
rtl8211e: ethernet-phy@1 {

View File

@ -32,7 +32,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
leds {
compatible = "gpio-leds";
pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>;
@@ -269,6 +281,12 @@
@@ -273,6 +285,12 @@
};
};
};
@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
};
&io_domains {
@@ -375,3 +393,12 @@
@@ -379,3 +397,12 @@
&usb_host0_ohci {
status = "okay";
};

View File

@ -14,7 +14,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -401,4 +401,11 @@
@@ -405,4 +405,11 @@
&usbdrd_dwc3 {
dr_mode = "host";
status = "okay";

View File

@ -9,7 +9,7 @@ Subject: [PATCH] rockchip: rk3328: add i2c0 controller for nanopi r2s
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -165,6 +165,10 @@
@@ -169,6 +169,10 @@
};
};

View File

@ -31,7 +31,7 @@ Signed-off-by: wevsty <ty@wevs.org>
reg = <0x0 0xff100000 0x0 0x1000>;
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1906,6 +1906,16 @@
@@ -1905,6 +1905,16 @@
};
};