From: Calvin Johnson <calvin.johnson@oss.nxp.com>
To: Grant Likely <grant.likely@arm.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Jeremy Linton <jeremy.linton@arm.com>,
Andrew Lunn <andrew@lunn.ch>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Russell King - ARM Linux admin <linux@armlinux.org.uk>,
Cristi Sovaiala <cristian.sovaiala@nxp.com>,
Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Madalin Bucur <madalin.bucur@oss.nxp.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Marcin Wojtas <mw@semihalf.com>,
Pieter Jansen Van Vuuren <pieter.jansenvv@bamboosystems.io>,
Jon <jon@solid-run.com>
Cc: linux.cj@gmail.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Diana Madalina Craciun <diana.craciun@nxp.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Frank Rowand <frowand.list@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org
Subject: [net-next PATCH v2 07/14] of: mdio: Refactor of_mdiobus_register_phy()
Date: Tue, 15 Dec 2020 22:13:08 +0530 [thread overview]
Message-ID: <20201215164315.3666-8-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20201215164315.3666-1-calvin.johnson@oss.nxp.com>
Refactor of_mdiobus_register_phy() to use fwnode_mdiobus_register_phy().
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v2: None
drivers/net/mdio/of_mdio.c | 43 +++-----------------------------------
include/linux/of_mdio.h | 6 +++++-
2 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index 31e6435dcc9f..fa914d285271 100644
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -32,7 +32,7 @@ static int of_get_phy_id(struct device_node *device, u32 *phy_id)
return fwnode_get_phy_id(of_fwnode_handle(device), phy_id);
}
-static struct mii_timestamper *of_find_mii_timestamper(struct device_node *node)
+struct mii_timestamper *of_find_mii_timestamper(struct device_node *node)
{
struct of_phandle_args arg;
int err;
@@ -49,6 +49,7 @@ static struct mii_timestamper *of_find_mii_timestamper(struct device_node *node)
return register_mii_timestamper(arg.np, arg.args[0]);
}
+EXPORT_SYMBOL(of_find_mii_timestamper);
int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy,
struct device_node *child, u32 addr)
@@ -97,45 +98,7 @@ EXPORT_SYMBOL(of_mdiobus_phy_device_register);
static int of_mdiobus_register_phy(struct mii_bus *mdio,
struct device_node *child, u32 addr)
{
- struct mii_timestamper *mii_ts;
- struct phy_device *phy;
- bool is_c45;
- int rc;
- u32 phy_id;
-
- mii_ts = of_find_mii_timestamper(child);
- if (IS_ERR(mii_ts))
- return PTR_ERR(mii_ts);
-
- is_c45 = of_device_is_compatible(child,
- "ethernet-phy-ieee802.3-c45");
-
- if (!is_c45 && !of_get_phy_id(child, &phy_id))
- phy = phy_device_create(mdio, addr, phy_id, 0, NULL);
- else
- phy = get_phy_device(mdio, addr, is_c45);
- if (IS_ERR(phy)) {
- if (mii_ts)
- unregister_mii_timestamper(mii_ts);
- return PTR_ERR(phy);
- }
-
- rc = of_mdiobus_phy_device_register(mdio, phy, child, addr);
- if (rc) {
- if (mii_ts)
- unregister_mii_timestamper(mii_ts);
- phy_device_free(phy);
- return rc;
- }
-
- /* phy->mii_ts may already be defined by the PHY driver. A
- * mii_timestamper probed via the device tree will still have
- * precedence.
- */
- if (mii_ts)
- phy->mii_ts = mii_ts;
-
- return 0;
+ return fwnode_mdiobus_register_phy(mdio, of_fwnode_handle(child), addr);
}
static int of_mdiobus_register_device(struct mii_bus *mdio,
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index cfe8c607a628..3b66016f18aa 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -34,6 +34,7 @@ struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
int of_phy_register_fixed_link(struct device_node *np);
void of_phy_deregister_fixed_link(struct device_node *np);
bool of_phy_is_fixed_link(struct device_node *np);
+struct mii_timestamper *of_find_mii_timestamper(struct device_node *np);
int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy,
struct device_node *child, u32 addr);
@@ -128,7 +129,10 @@ static inline bool of_phy_is_fixed_link(struct device_node *np)
{
return false;
}
-
+static inline struct mii_timestamper *of_find_mii_timestamper(struct device_node *np)
+{
+ return NULL;
+}
static inline int of_mdiobus_phy_device_register(struct mii_bus *mdio,
struct phy_device *phy,
struct device_node *child, u32 addr)
--
2.17.1
next prev parent reply other threads:[~2020-12-15 16:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 16:43 [net-next PATCH v2 00/14] ACPI support for dpaa2 driver Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 01/14] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 02/14] net: phy: Introduce phy related fwnode functions Calvin Johnson
2020-12-15 17:23 ` Andy Shevchenko
2020-12-17 7:32 ` Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 03/14] of: mdio: Refactor of_phy_find_device() Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 04/14] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2020-12-15 17:28 ` Andy Shevchenko
2020-12-17 8:28 ` Calvin Johnson
2020-12-17 9:44 ` Andy Shevchenko
2020-12-15 16:43 ` [net-next PATCH v2 05/14] of: mdio: Refactor of_get_phy_id() Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 06/14] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson
2020-12-15 17:33 ` Andy Shevchenko
2020-12-18 5:34 ` Calvin Johnson
2020-12-18 15:35 ` Andy Shevchenko
2020-12-15 16:43 ` Calvin Johnson [this message]
2020-12-15 16:43 ` [net-next PATCH v2 08/14] net: mdiobus: Introduce fwnode_mdiobus_register() Calvin Johnson
2020-12-15 17:53 ` Andy Shevchenko
2020-12-18 5:40 ` Calvin Johnson
2020-12-18 15:36 ` Andy Shevchenko
2020-12-15 16:43 ` [net-next PATCH v2 09/14] net/fsl: Use fwnode_mdiobus_register() Calvin Johnson
2020-12-15 17:55 ` Andy Shevchenko
2020-12-18 5:48 ` Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 10/14] device property: Introduce fwnode_get_id() Calvin Johnson
2020-12-15 17:00 ` Laurent Pinchart
2020-12-15 17:49 ` Andy Shevchenko
2020-12-18 6:09 ` Calvin Johnson
2020-12-15 17:45 ` Andy Shevchenko
2020-12-18 6:12 ` Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 11/14] phylink: introduce phylink_fwnode_phy_connect() Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 12/14] net: phylink: Refactor phylink_of_phy_connect() Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 13/14] net: phy: Introduce fwnode_mdio_find_device() Calvin Johnson
2020-12-15 16:43 ` [net-next PATCH v2 14/14] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Calvin Johnson
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=20201215164315.3666-8-calvin.johnson@oss.nxp.com \
--to=calvin.johnson@oss.nxp.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.com \
--cc=cristian.sovaiala@nxp.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=diana.craciun@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=florinlaurentiu.chiculita@nxp.com \
--cc=frowand.list@gmail.com \
--cc=grant.likely@arm.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=jeremy.linton@arm.com \
--cc=jon@solid-run.com \
--cc=kuba@kernel.org \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux.cj@gmail.com \
--cc=linux@armlinux.org.uk \
--cc=madalin.bucur@oss.nxp.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=pieter.jansenvv@bamboosystems.io \
--cc=rafael@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).