diff options
| author | John Audia <graysky@archlinux.us> | 2022-02-06 11:51:17 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-02-11 23:17:40 +0100 |
| commit | e9c1c83679891a02e3b95b954847a95621cbbc79 (patch) | |
| tree | bdb58f19b89da010f5ec9f8949f740025bf74cd0 /target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | |
| parent | 337e942290fa6a18e0289ae32420c5c402aead1a (diff) | |
| download | upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.tar.gz upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.tar.bz2 upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.zip | |
kernel: bump 5.10 to 5.10.98
Manually rebased:
bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index e75d4c7a0a..a0c892d706 100644 --- a/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3071,6 +3079,16 @@ static int mtk_probe(struct platform_dev +@@ -3104,6 +3112,16 @@ static int mtk_probe(struct platform_dev } } @@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> GFP_KERNEL); --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h -@@ -450,6 +450,12 @@ +@@ -456,6 +456,12 @@ #define RSTCTRL_FE BIT(6) #define RSTCTRL_PPE BIT(31) |