Commit dc0f3ed1 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by David S. Miller

net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032

Add support for Atheros 100Base-T PHYs. The only difference seems to be
the ability to test 2 pairs instead of 4 and the lack of 1000Base-T
specific register.

Only the ATH9331 was tested with this patch.
Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 943bbe1d
...@@ -920,10 +920,16 @@ static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair) ...@@ -920,10 +920,16 @@ static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair)
static int at803x_cable_test_get_status(struct phy_device *phydev, static int at803x_cable_test_get_status(struct phy_device *phydev,
bool *finished) bool *finished)
{ {
unsigned long pair_mask = 0xf; unsigned long pair_mask;
int retries = 20; int retries = 20;
int pair, ret; int pair, ret;
if (phydev->phy_id == ATH9331_PHY_ID ||
phydev->phy_id == ATH8032_PHY_ID)
pair_mask = 0x3;
else
pair_mask = 0xf;
*finished = false; *finished = false;
/* According to the datasheet the CDT can be performed when /* According to the datasheet the CDT can be performed when
...@@ -958,6 +964,8 @@ static int at803x_cable_test_start(struct phy_device *phydev) ...@@ -958,6 +964,8 @@ static int at803x_cable_test_start(struct phy_device *phydev)
*/ */
phy_write(phydev, MII_BMCR, BMCR_ANENABLE); phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
phy_write(phydev, MII_ADVERTISE, ADVERTISE_CSMA); phy_write(phydev, MII_ADVERTISE, ADVERTISE_CSMA);
if (phydev->phy_id != ATH9331_PHY_ID &&
phydev->phy_id != ATH8032_PHY_ID)
phy_write(phydev, MII_CTRL1000, 0); phy_write(phydev, MII_CTRL1000, 0);
/* we do all the (time consuming) work later */ /* we do all the (time consuming) work later */
...@@ -1030,6 +1038,7 @@ static struct phy_driver at803x_driver[] = { ...@@ -1030,6 +1038,7 @@ static struct phy_driver at803x_driver[] = {
.name = "Qualcomm Atheros AR8032", .name = "Qualcomm Atheros AR8032",
.probe = at803x_probe, .probe = at803x_probe,
.remove = at803x_remove, .remove = at803x_remove,
.flags = PHY_POLL_CABLE_TEST,
.config_init = at803x_config_init, .config_init = at803x_config_init,
.link_change_notify = at803x_link_change_notify, .link_change_notify = at803x_link_change_notify,
.set_wol = at803x_set_wol, .set_wol = at803x_set_wol,
...@@ -1039,15 +1048,20 @@ static struct phy_driver at803x_driver[] = { ...@@ -1039,15 +1048,20 @@ static struct phy_driver at803x_driver[] = {
/* PHY_BASIC_FEATURES */ /* PHY_BASIC_FEATURES */
.ack_interrupt = at803x_ack_interrupt, .ack_interrupt = at803x_ack_interrupt,
.config_intr = at803x_config_intr, .config_intr = at803x_config_intr,
.cable_test_start = at803x_cable_test_start,
.cable_test_get_status = at803x_cable_test_get_status,
}, { }, {
/* ATHEROS AR9331 */ /* ATHEROS AR9331 */
PHY_ID_MATCH_EXACT(ATH9331_PHY_ID), PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
.name = "Qualcomm Atheros AR9331 built-in PHY", .name = "Qualcomm Atheros AR9331 built-in PHY",
.suspend = at803x_suspend, .suspend = at803x_suspend,
.resume = at803x_resume, .resume = at803x_resume,
.flags = PHY_POLL_CABLE_TEST,
/* PHY_BASIC_FEATURES */ /* PHY_BASIC_FEATURES */
.ack_interrupt = &at803x_ack_interrupt, .ack_interrupt = &at803x_ack_interrupt,
.config_intr = &at803x_config_intr, .config_intr = &at803x_config_intr,
.cable_test_start = at803x_cable_test_start,
.cable_test_get_status = at803x_cable_test_get_status,
} }; } };
module_phy_driver(at803x_driver); module_phy_driver(at803x_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment