From: Ioana Ciornei <ciorneiioana@gmail.com>
To: davem@davemloft.net, kuba@kernel.org, hkallweit1@gmail.com,
netdev@vger.kernel.org, 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>,
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>, Saravana Kannan <saravanak@google.com>,
Randy Dunlap <rdunlap@infradead.org>,
calvin.johnson@oss.nxp.com
Cc: Cristi Sovaiala <cristian.sovaiala@nxp.com>,
Florin Laurentiu Chiculita <florinlaurentiu.chiculita@nxp.com>,
Madalin Bucur <madalin.bucur@nxp.com>,
linux-arm-kernel@lists.infradead.org,
Diana Madalina Craciun <diana.craciun@nxp.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux.cj@gmail.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Len Brown <lenb@kernel.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: [PATCH net-next v9 09/15] of: mdio: Refactor of_mdiobus_register_phy()
Date: Fri, 11 Jun 2021 13:53:55 +0300 [thread overview]
Message-ID: <20210611105401.270673-10-ciorneiioana@gmail.com> (raw)
In-Reply-To: <20210611105401.270673-1-ciorneiioana@gmail.com>
From: Calvin Johnson <calvin.johnson@oss.nxp.com>
Refactor of_mdiobus_register_phy() to use fwnode_mdiobus_register_phy().
Also, remove the of_find_mii_timestamper() since the fwnode variant is
used instead.
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Acked-by: Grant Likely <grant.likely@arm.com>
---
Changes in v9:
- remove the of_find_mii_timestamper() in this patch rather the previous
one
Changes in v8: None
Changes in v7:
- include fwnode_mdio.h
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/net/mdio/of_mdio.c | 56 +-------------------------------------
1 file changed, 1 insertion(+), 55 deletions(-)
diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c
index 17327bbc1de4..8744b1e1c2b1 100644
--- a/drivers/net/mdio/of_mdio.c
+++ b/drivers/net/mdio/of_mdio.c
@@ -33,24 +33,6 @@ 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 of_phandle_args arg;
- int err;
-
- err = of_parse_phandle_with_fixed_args(node, "timestamper", 1, 0, &arg);
-
- if (err == -ENOENT)
- return NULL;
- else if (err)
- return ERR_PTR(err);
-
- if (arg.args_count != 1)
- return ERR_PTR(-EINVAL);
-
- return register_mii_timestamper(arg.np, arg.args[0]);
-}
-
int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy,
struct device_node *child, u32 addr)
{
@@ -63,43 +45,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)) {
- unregister_mii_timestamper(mii_ts);
- return PTR_ERR(phy);
- }
-
- rc = of_mdiobus_phy_device_register(mdio, phy, child, addr);
- if (rc) {
- 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,
--
2.31.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-11 10:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 10:53 [PATCH net-next v9 00/15] ACPI support for dpaa2 driver Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 01/15] Documentation: ACPI: DSD: Document MDIO PHY Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 02/15] net: phy: Introduce fwnode_mdio_find_device() Ioana Ciornei
2021-06-11 11:20 ` Andy Shevchenko
2021-06-11 10:53 ` [PATCH net-next v9 03/15] net: phy: Introduce phy related fwnode functions Ioana Ciornei
2021-06-11 11:26 ` Andy Shevchenko
2021-06-11 11:40 ` Rafael J. Wysocki
2021-06-11 12:08 ` Russell King (Oracle)
2021-06-11 12:31 ` Rafael J. Wysocki
2021-06-11 10:53 ` [PATCH net-next v9 04/15] of: mdio: Refactor of_phy_find_device() Ioana Ciornei
2021-06-11 11:28 ` Andy Shevchenko
2021-06-11 11:30 ` Andy Shevchenko
2021-06-11 11:35 ` Russell King (Oracle)
2021-06-11 10:53 ` [PATCH net-next v9 05/15] net: phy: Introduce fwnode_get_phy_id() Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 06/15] of: mdio: Refactor of_get_phy_id() Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 07/15] net: mii_timestamper: check NULL in unregister_mii_timestamper() Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 08/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Ioana Ciornei
2021-06-11 10:53 ` Ioana Ciornei [this message]
2021-06-11 10:53 ` [PATCH net-next v9 10/15] ACPI: utils: Introduce acpi_get_local_address() Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 11/15] net: mdio: Add ACPI support code for mdio Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 12/15] net/fsl: Use [acpi|of]_mdiobus_register Ioana Ciornei
2021-06-11 10:53 ` [PATCH net-next v9 13/15] net: phylink: introduce phylink_fwnode_phy_connect() Ioana Ciornei
2021-06-11 11:17 ` Russell King (Oracle)
2021-06-11 10:54 ` [PATCH net-next v9 14/15] net: phylink: Refactor phylink_of_phy_connect() Ioana Ciornei
2021-06-11 11:18 ` Russell King (Oracle)
2021-06-11 10:54 ` [PATCH net-next v9 15/15] net: dpaa2-mac: Add ACPI support for DPAA2 MAC driver Ioana Ciornei
2021-06-11 20:20 ` [PATCH net-next v9 00/15] ACPI support for dpaa2 driver patchwork-bot+netdevbpf
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=20210611105401.270673-10-ciorneiioana@gmail.com \
--to=ciorneiioana@gmail.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.com \
--cc=calvin.johnson@oss.nxp.com \
--cc=cristian.sovaiala@nxp.com \
--cc=davem@davemloft.net \
--cc=diana.craciun@nxp.com \
--cc=f.fainelli@gmail.com \
--cc=florinlaurentiu.chiculita@nxp.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=lenb@kernel.org \
--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@nxp.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=pieter.jansenvv@bamboosystems.io \
--cc=rafael@kernel.org \
--cc=rdunlap@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=saravanak@google.com \
/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).