From: Michael Walle <michael@walle.cc>
To: u-boot@lists.denx.de
Subject: [PATCH v4 08/12] phy: atheros: introduce debug read and write functions
Date: Thu, 7 May 2020 00:11:55 +0200 [thread overview]
Message-ID: <20200506221159.1298-9-michael@walle.cc> (raw)
In-Reply-To: <20200506221159.1298-1-michael@walle.cc>
Provide functions to read and write the Atheros debug registers.
Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---
drivers/net/phy/atheros.c | 57 ++++++++++++++++++++++++++++-----------
1 file changed, 41 insertions(+), 16 deletions(-)
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 5ff5875d3d..660dcd9491 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -30,32 +30,57 @@
#define AR8031_PHY_ID 0x004dd074
#define AR8035_PHY_ID 0x004dd072
-static void ar803x_enable_rx_delay(struct phy_device *phydev, bool on)
+static int ar803x_debug_reg_read(struct phy_device *phydev, u16 reg)
{
- int regval;
+ int ret;
+
+ ret = phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_ADDR_REG,
+ reg);
+ if (ret < 0)
+ return ret;
+
+ return phy_read(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG);
+}
+
+static int ar803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
+ u16 clear, u16 set)
+{
+ int val;
+
+ val = ar803x_debug_reg_read(phydev, reg);
+ if (val < 0)
+ return val;
+
+ val &= 0xffff;
+ val &= ~clear;
+ val |= set;
+
+ return phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG,
+ val);
+}
+
+static int ar803x_enable_rx_delay(struct phy_device *phydev, bool on)
+{
+ u16 clear = 0, set = 0;
- phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_ADDR_REG,
- AR803x_DEBUG_REG_0);
- regval = phy_read(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG);
if (on)
- regval |= AR803x_RGMII_RX_CLK_DLY;
+ set = AR803x_RGMII_RX_CLK_DLY;
else
- regval &= ~AR803x_RGMII_RX_CLK_DLY;
- phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG, regval);
+ clear = AR803x_RGMII_RX_CLK_DLY;
+
+ return ar803x_debug_reg_mask(phydev, AR803x_DEBUG_REG_0, clear, set);
}
-static void ar803x_enable_tx_delay(struct phy_device *phydev, bool on)
+static int ar803x_enable_tx_delay(struct phy_device *phydev, bool on)
{
- int regval;
+ u16 clear = 0, set = 0;
- phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_ADDR_REG,
- AR803x_DEBUG_REG_5);
- regval = phy_read(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG);
if (on)
- regval |= AR803x_RGMII_TX_CLK_DLY;
+ set = AR803x_RGMII_TX_CLK_DLY;
else
- regval &= ~AR803x_RGMII_TX_CLK_DLY;
- phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG, regval);
+ clear = AR803x_RGMII_TX_CLK_DLY;
+
+ return ar803x_debug_reg_mask(phydev, AR803x_DEBUG_REG_5, clear, set);
}
static int ar8021_config(struct phy_device *phydev)
--
2.20.1
next prev parent reply other threads:[~2020-05-06 22:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 22:11 [PATCH v4 00/12] phy: atheros: dt bindings and cleanup Michael Walle
2020-05-06 22:11 ` [PATCH v4 01/12] phy: atheros: Make RGMII Tx delays actually configurable for AR8035 Michael Walle
2020-05-07 18:51 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 02/12] phy: atheros: Use common functions for RGMII internal delays Michael Walle
2020-05-07 18:52 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 03/12] phy: atheros: Clarify the configuration of the CLK_25M output pin Michael Walle
2020-05-07 18:52 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 04/12] phy: atheros: Explicitly disable RGMII delays Michael Walle
2020-05-07 18:52 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 05/12] phy: atheros: Clarify the intention of ar8021_config Michael Walle
2020-05-07 18:52 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 06/12] phy: atheros: fix AR8021 PHY ID mask Michael Walle
2020-05-07 18:53 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 07/12] phy: atheros: use defines for PHY IDs Michael Walle
2020-05-07 18:53 ` Tom Rini
2020-05-06 22:11 ` Michael Walle [this message]
2020-05-07 18:53 ` [PATCH v4 08/12] phy: atheros: introduce debug read and write functions Tom Rini
2020-05-06 22:11 ` [PATCH v4 09/12] phy: atheros: move delay config to common function Michael Walle
2020-05-07 18:53 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 10/12] phy: atheros: add device tree bindings and config Michael Walle
2020-05-07 18:53 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 11/12] phy: atheros: ar8035: remove static clock config Michael Walle
2020-05-07 18:53 ` Tom Rini
2020-05-06 22:11 ` [PATCH v4 12/12] phy: atheros: consolidate {ar8031|ar8035}_config() Michael Walle
2020-05-07 18:53 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200506221159.1298-9-michael@walle.cc \
--to=michael@walle.cc \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox