From: Michael Walle <michael@walle.cc>
To: u-boot@lists.denx.de
Subject: [PATCH v4 03/12] phy: atheros: Clarify the configuration of the CLK_25M output pin
Date: Thu, 7 May 2020 00:11:50 +0200 [thread overview]
Message-ID: <20200506221159.1298-4-michael@walle.cc> (raw)
In-Reply-To: <20200506221159.1298-1-michael@walle.cc>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Also take the opportunity to use the phy_read_mmd and phy_write_mmd
convenience functions.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---
drivers/net/phy/atheros.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index c0c2b4db39..1da18eb5d4 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -17,6 +17,15 @@
#define AR803x_DEBUG_REG_0 0x0
#define AR803x_RGMII_RX_CLK_DLY BIT(15)
+/* CLK_25M register is at MMD 7, address 0x8016 */
+#define AR803x_CLK_25M_SEL_REG 0x8016
+/* AR8035: Select frequency on CLK_25M pin through bits 4:3 */
+#define AR8035_CLK_25M_FREQ_25M (0 | 0)
+#define AR8035_CLK_25M_FREQ_50M (0 | BIT(3))
+#define AR8035_CLK_25M_FREQ_62M (BIT(4) | 0)
+#define AR8035_CLK_25M_FREQ_125M (BIT(4) | BIT(3))
+#define AR8035_CLK_25M_MASK GENMASK(4, 3)
+
static void ar803x_enable_rx_delay(struct phy_device *phydev, bool on)
{
int regval;
@@ -78,11 +87,11 @@ static int ar8035_config(struct phy_device *phydev)
{
int regval;
- phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x0007);
- phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016);
- phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007);
- regval = phy_read(phydev, MDIO_DEVAD_NONE, 0xe);
- phy_write(phydev, MDIO_DEVAD_NONE, 0xe, (regval|0x0018));
+ /* Configure CLK_25M output clock at 125 MHz */
+ regval = phy_read_mmd(phydev, MDIO_MMD_AN, AR803x_CLK_25M_SEL_REG);
+ regval &= ~AR8035_CLK_25M_MASK; /* No surprises */
+ regval |= AR8035_CLK_25M_FREQ_125M;
+ phy_write_mmd(phydev, MDIO_MMD_AN, AR803x_CLK_25M_SEL_REG, regval);
if ((phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
(phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID))
--
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 ` Michael Walle [this message]
2020-05-07 18:52 ` [PATCH v4 03/12] phy: atheros: Clarify the configuration of the CLK_25M output pin 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 ` [PATCH v4 08/12] phy: atheros: introduce debug read and write functions Michael Walle
2020-05-07 18:53 ` 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-4-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