diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 15:29:16 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:05:34 +0200 |
| commit | 8cc7ac54b6cfbccf61f31c51313e6480811b5f44 (patch) | |
| tree | 4a0f1d2c650d837e1fd6a0156827c4a1ac958bf8 /target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch | |
| parent | 1c95d78f087c9cd78caf17181525c8853d78bf1c (diff) | |
| download | upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.gz upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.bz2 upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.zip | |
kernel: bump 5.4 to 5.4.150
Manually rebased:
generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
Removed upstreamed:
generic/backport-5.4/040-ARM-8918-2-only-build-return_address-if-needed.patch
layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch b/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch index 291307791d..718ed8ea2d 100644 --- a/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch +++ b/target/linux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch @@ -47,7 +47,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com> return -EINVAL; } -@@ -1335,12 +1337,11 @@ mt7530_setup(struct dsa_switch *ds) +@@ -1332,12 +1334,11 @@ mt7530_setup(struct dsa_switch *ds) return 0; } @@ -63,7 +63,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com> switch (port) { case 0: /* Internal phy */ -@@ -1349,33 +1350,114 @@ static void mt7530_phylink_mac_config(st +@@ -1346,33 +1347,114 @@ static void mt7530_phylink_mac_config(st case 3: case 4: if (state->interface != PHY_INTERFACE_MODE_GMII) @@ -189,7 +189,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com> return; } -@@ -1443,61 +1525,44 @@ static void mt7530_phylink_mac_link_up(s +@@ -1440,61 +1522,44 @@ static void mt7530_phylink_mac_link_up(s mt7530_set(priv, MT7530_PMCR_P(port), mcr); } @@ -274,7 +274,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com> phylink_set(mask, Pause); phylink_set(mask, Asym_Pause); -@@ -1593,12 +1658,45 @@ static int mt7530_set_mac_eee(struct dsa +@@ -1590,12 +1655,45 @@ static int mt7530_set_mac_eee(struct dsa return 0; } @@ -323,7 +323,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com> .get_ethtool_stats = mt7530_get_ethtool_stats, .get_sset_count = mt7530_get_sset_count, .port_enable = mt7530_port_enable, -@@ -1615,18 +1713,43 @@ static const struct dsa_switch_ops mt753 +@@ -1612,18 +1710,43 @@ static const struct dsa_switch_ops mt753 .port_vlan_del = mt7530_port_vlan_del, .port_mirror_add = mt7530_port_mirror_add, .port_mirror_del = mt7530_port_mirror_del, @@ -372,7 +372,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com> { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mt7530_of_match); -@@ -1664,8 +1787,21 @@ mt7530_probe(struct mdio_device *mdiodev +@@ -1661,8 +1784,21 @@ mt7530_probe(struct mdio_device *mdiodev /* Get the hardware identifier from the devicetree node. * We will need it for some of the clock and regulator setup. */ |