From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <davem@davemloft.net>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <f.fainelli@gmail.com>,
<hkallweit1@gmail.com>, <andrew@lunn.ch>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH 07/16] net: phy: adin: make RGMII internal delays configurable
Date: Mon, 5 Aug 2019 19:54:44 +0300 [thread overview]
Message-ID: <20190805165453.3989-8-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com>
The internal delays for the RGMII are configurable for both RX & TX. This
change adds support for configuring them via device-tree (or ACPI).
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/net/phy/adin.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index e3d2ff8cc09c..cb96d47d457e 100644
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -5,6 +5,7 @@
* Copyright 2019 Analog Devices Inc.
*/
#include <linux/kernel.h>
+#include <linux/bitfield.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/module.h>
@@ -12,6 +13,8 @@
#include <linux/phy.h>
#include <linux/property.h>
+#include <dt-bindings/net/adin.h>
+
#define PHY_ID_ADIN1200 0x0283bc20
#define PHY_ID_ADIN1300 0x0283bc30
@@ -35,6 +38,12 @@
#define ADIN1300_INT_STATUS_REG 0x0019
#define ADIN1300_GE_RGMII_CFG_REG 0xff23
+#define ADIN1300_GE_RGMII_RX_MSK GENMASK(8, 6)
+#define ADIN1300_GE_RGMII_RX_SEL(x) \
+ FIELD_PREP(ADIN1300_GE_RGMII_RX_MSK, x)
+#define ADIN1300_GE_RGMII_GTX_MSK GENMASK(5, 3)
+#define ADIN1300_GE_RGMII_GTX_SEL(x) \
+ FIELD_PREP(ADIN1300_GE_RGMII_GTX_MSK, x)
#define ADIN1300_GE_RGMII_RXID_EN BIT(2)
#define ADIN1300_GE_RGMII_TXID_EN BIT(1)
#define ADIN1300_GE_RGMII_EN BIT(0)
@@ -67,6 +76,32 @@ static int adin_get_phy_internal_mode(struct phy_device *phydev)
return -EINVAL;
}
+static void adin_config_rgmii_rx_internal_delay(struct phy_device *phydev,
+ int *reg)
+{
+ struct device *dev = &phydev->mdio.dev;
+ u32 val;
+
+ if (device_property_read_u32(dev, "adi,rx-internal-delay", &val))
+ val = ADIN1300_RGMII_2_00_NS;
+
+ *reg &= ADIN1300_GE_RGMII_RX_MSK;
+ *reg |= ADIN1300_GE_RGMII_RX_SEL(val);
+}
+
+static void adin_config_rgmii_tx_internal_delay(struct phy_device *phydev,
+ int *reg)
+{
+ struct device *dev = &phydev->mdio.dev;
+ u32 val;
+
+ if (device_property_read_u32(dev, "adi,tx-internal-delay", &val))
+ val = ADIN1300_RGMII_2_00_NS;
+
+ *reg &= ADIN1300_GE_RGMII_GTX_MSK;
+ *reg |= ADIN1300_GE_RGMII_GTX_SEL(val);
+}
+
static int adin_config_rgmii_mode(struct phy_device *phydev,
phy_interface_t intf)
{
@@ -86,6 +121,7 @@ static int adin_config_rgmii_mode(struct phy_device *phydev,
if (intf == PHY_INTERFACE_MODE_RGMII_ID ||
intf == PHY_INTERFACE_MODE_RGMII_RXID) {
reg |= ADIN1300_GE_RGMII_RXID_EN;
+ adin_config_rgmii_rx_internal_delay(phydev, ®);
} else {
reg &= ~ADIN1300_GE_RGMII_RXID_EN;
}
@@ -93,6 +129,7 @@ static int adin_config_rgmii_mode(struct phy_device *phydev,
if (intf == PHY_INTERFACE_MODE_RGMII_ID ||
intf == PHY_INTERFACE_MODE_RGMII_TXID) {
reg |= ADIN1300_GE_RGMII_TXID_EN;
+ adin_config_rgmii_tx_internal_delay(phydev, ®);
} else {
reg &= ~ADIN1300_GE_RGMII_TXID_EN;
}
--
2.20.1
next prev parent reply other threads:[~2019-08-05 13:55 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 16:54 [PATCH 00/16] net: phy: adin: add support for Analog Devices PHYs Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 01/16] " Alexandru Ardelean
2019-08-05 14:16 ` Andrew Lunn
2019-08-06 6:32 ` Ardelean, Alexandru
2019-08-05 15:17 ` Andrew Lunn
2019-08-06 6:35 ` Ardelean, Alexandru
2019-08-05 20:54 ` Heiner Kallweit
2019-08-06 6:35 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 02/16] net: phy: adin: hook genphy_{suspend,resume} into the driver Alexandru Ardelean
2019-08-05 14:17 ` Andrew Lunn
2019-08-05 16:54 ` [PATCH 03/16] net: phy: adin: add support for interrupts Alexandru Ardelean
2019-08-05 14:21 ` Andrew Lunn
2019-08-06 6:37 ` Ardelean, Alexandru
2019-08-05 21:02 ` Heiner Kallweit
2019-08-06 6:38 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 04/16] net: phy: adin: add {write,read}_mmd hooks Alexandru Ardelean
2019-08-05 14:25 ` Andrew Lunn
2019-08-06 6:38 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 05/16] net: phy: adin: configure RGMII/RMII/MII modes on config Alexandru Ardelean
2019-08-05 14:39 ` Andrew Lunn
2019-08-06 6:43 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 06/16] net: phy: adin: support PHY mode converters Alexandru Ardelean
2019-08-05 14:51 ` Andrew Lunn
2019-08-06 6:47 ` Ardelean, Alexandru
2019-08-06 15:39 ` Andrew Lunn
2019-08-07 8:00 ` Ardelean, Alexandru
2019-08-07 13:20 ` Andrew Lunn
2019-08-05 16:54 ` Alexandru Ardelean [this message]
2019-08-05 16:54 ` [PATCH 08/16] net: phy: adin: make RMII fifo depth configurable Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 09/16] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 10/16] net: phy: adin: add EEE translation layer for Clause 22 Alexandru Ardelean
2019-08-05 22:11 ` Andrew Lunn
2019-08-06 6:47 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 11/16] net: phy: adin: PHY reset mechanisms Alexandru Ardelean
2019-08-05 15:15 ` Andrew Lunn
2019-08-06 6:50 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 12/16] net: phy: adin: read EEE setting from device-tree Alexandru Ardelean
2019-08-05 15:19 ` Andrew Lunn
2019-08-06 6:52 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 13/16] net: phy: adin: implement Energy Detect Powerdown mode Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 14/16] net: phy: adin: make sure down-speed auto-neg is enabled Alexandru Ardelean
2019-08-05 15:22 ` Andrew Lunn
2019-08-06 6:53 ` Ardelean, Alexandru
2019-08-06 5:52 ` Heiner Kallweit
2019-08-06 6:53 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 15/16] net: phy: adin: add ethtool get_stats support Alexandru Ardelean
2019-08-05 15:28 ` Andrew Lunn
2019-08-06 7:11 ` Ardelean, Alexandru
2019-08-06 15:46 ` Andrew Lunn
2019-08-07 7:52 ` Ardelean, Alexandru
2019-08-05 15:30 ` Andrew Lunn
2019-08-06 7:18 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 16/16] dt-bindings: net: add bindings for ADIN PHY driver Alexandru Ardelean
2019-08-05 14:11 ` Andrew Lunn
2019-08-06 7:03 ` Ardelean, Alexandru
2019-08-06 11:47 ` Ardelean, Alexandru
2019-08-05 14:27 ` Andrew Lunn
2019-08-06 6:57 ` Ardelean, Alexandru
2019-08-06 15:04 ` Rob Herring
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=20190805165453.3989-8-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).