be381a7ac7
Deleted (upstreamed): generic/backport-5.15/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch [1] generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch [2] generic/pending-5.15/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch [3] generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch [4] Manually rebased: generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch ramips/patches-5.15/710-at803x.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d29cda15cab086d82d692de016f7249545d4b6b4 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d5aad7d63b1b5c1f3c4b69e12c05e7c7d196fae8 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=ed750e22e44366e264bcdf7b1cf0713f08f7980a [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=0fe94b84c43cfea867e1721606185e8686d7d32f Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [Refresh patches again] [Remove generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
From b4df02b562f4aa14ff6811f30e1b4d2159585c59 Mon Sep 17 00:00:00 2001
|
|
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Date: Sun, 19 Sep 2021 18:28:15 +0200
|
|
Subject: net: phy: at803x: add support for qca 8327 A variant internal phy
|
|
|
|
For qca8327 internal phy there are 2 different switch variant with 2
|
|
different phy id. Add this missing variant so the internal phy can be
|
|
correctly identified and fixed.
|
|
|
|
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/at803x.c | 25 ++++++++++++++++++++-----
|
|
1 file changed, 20 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/phy/at803x.c
|
|
+++ b/drivers/net/phy/at803x.c
|
|
@@ -150,7 +150,8 @@
|
|
#define ATH8035_PHY_ID 0x004dd072
|
|
#define AT8030_PHY_ID_MASK 0xffffffef
|
|
|
|
-#define QCA8327_PHY_ID 0x004dd034
|
|
+#define QCA8327_A_PHY_ID 0x004dd033
|
|
+#define QCA8327_B_PHY_ID 0x004dd034
|
|
#define QCA8337_PHY_ID 0x004dd036
|
|
#define QCA8K_PHY_ID_MASK 0xffffffff
|
|
|
|
@@ -1413,10 +1414,23 @@ static struct phy_driver at803x_driver[]
|
|
.get_strings = at803x_get_strings,
|
|
.get_stats = at803x_get_stats,
|
|
}, {
|
|
- /* QCA8327 */
|
|
- .phy_id = QCA8327_PHY_ID,
|
|
+ /* QCA8327-A from switch QCA8327-AL1A */
|
|
+ .phy_id = QCA8327_A_PHY_ID,
|
|
.phy_id_mask = QCA8K_PHY_ID_MASK,
|
|
- .name = "QCA PHY 8327",
|
|
+ .name = "QCA PHY 8327-A",
|
|
+ /* PHY_GBIT_FEATURES */
|
|
+ .probe = at803x_probe,
|
|
+ .flags = PHY_IS_INTERNAL,
|
|
+ .config_init = qca83xx_config_init,
|
|
+ .soft_reset = genphy_soft_reset,
|
|
+ .get_sset_count = at803x_get_sset_count,
|
|
+ .get_strings = at803x_get_strings,
|
|
+ .get_stats = at803x_get_stats,
|
|
+}, {
|
|
+ /* QCA8327-B from switch QCA8327-BL1A */
|
|
+ .phy_id = QCA8327_B_PHY_ID,
|
|
+ .phy_id_mask = QCA8K_PHY_ID_MASK,
|
|
+ .name = "QCA PHY 8327-B",
|
|
/* PHY_GBIT_FEATURES */
|
|
.probe = at803x_probe,
|
|
.flags = PHY_IS_INTERNAL,
|
|
@@ -1436,7 +1450,8 @@ static struct mdio_device_id __maybe_unu
|
|
{ PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
|
|
{ PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
|
|
{ PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
|
|
- { PHY_ID_MATCH_EXACT(QCA8327_PHY_ID) },
|
|
+ { PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
|
|
+ { PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
|
|
{ }
|
|
};
|
|
|