diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-03 16:46:35 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-03 19:58:31 +0200 |
| commit | be0639063a701254677bb982d8e28a71a931433f (patch) | |
| tree | 47c329b76b07a78779817ee0cfd52cfcbc9a57f1 /target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch | |
| parent | 60e88fde77ea413fc2fb367cdcc47d5282d391e3 (diff) | |
| download | upstream-be0639063a701254677bb982d8e28a71a931433f.tar.gz upstream-be0639063a701254677bb982d8e28a71a931433f.tar.bz2 upstream-be0639063a701254677bb982d8e28a71a931433f.zip | |
kernel: bump 5.4 to 5.4.203
Merged upstream:
bcm27xx/patches-5.4/950-1014-Revert-mailbox-avoid-timer-start-from-callback.patch
generic/backport-5.4/080-wireguard-0021-crypto-blake2s-generic-C-library-implementation-and-.patch
Manually adapted:
layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
oxnas/patches-5.4/100-oxnas-clk-plla-pllb.patch
Compile-tested: lantiq/xrx200
Run-tested: lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch b/target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch index 8c65e3a492..f53ff2940f 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0388-drivers-net-phy-aquantia-Add-XFI-counters.patch @@ -26,7 +26,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_KR 0 -@@ -153,9 +159,12 @@ struct aqr107_hw_stat { +@@ -155,9 +161,12 @@ struct aqr107_hw_stat { const char *name; int reg; int size; @@ -40,7 +40,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> static const struct aqr107_hw_stat aqr107_hw_stats[] = { SGMII_STAT("sgmii_rx_good_frames", RX_GOOD_FRAMES, 26), SGMII_STAT("sgmii_rx_bad_frames", RX_BAD_FRAMES, 26), -@@ -167,6 +176,10 @@ static const struct aqr107_hw_stat aqr10 +@@ -169,6 +178,10 @@ static const struct aqr107_hw_stat aqr10 SGMII_STAT("sgmii_tx_line_collisions", TX_LINE_COLLISIONS, 8), SGMII_STAT("sgmii_tx_frame_alignment_err", TX_FRAME_ALIGN_ERR, 16), SGMII_STAT("sgmii_tx_runt_frames", TX_RUNT_FRAMES, 22), @@ -51,7 +51,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> }; #define AQR107_SGMII_STAT_SZ ARRAY_SIZE(aqr107_hw_stats) -@@ -196,13 +209,13 @@ static u64 aqr107_get_stat(struct phy_de +@@ -198,13 +211,13 @@ static u64 aqr107_get_stat(struct phy_de u64 ret; int val; @@ -67,7 +67,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> if (val < 0) return U64_MAX; -@@ -768,18 +781,26 @@ static struct phy_driver aqr_driver[] = +@@ -781,18 +794,26 @@ static struct phy_driver aqr_driver[] = { PHY_ID_MATCH_MODEL(PHY_ID_AQR112), .name = "Aquantia AQR112", |