From: Calvin Johnson <calvin.johnson@oss.nxp.com>
To: linux.cj@gmail.com, 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>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
Diana Madalina Craciun <diana.craciun@nxp.com>,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
linux-acpi@vger.kernel.org, Marcin Wojtas <mw@semihalf.com>,
Makarand Pawagi <makarand.pawagi@nxp.com>,
"Rajesh V . Bikkina" <rajesh.bikkina@nxp.com>,
Varun Sethi <V.Sethi@nxp.com>,
linux-kernel@vger.kernel.org,
Pankaj Bansal <pankaj.bansal@nxp.com>,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Heiner Kallweit <hkallweit1@gmail.com>
Subject: [net-next PATCH v2 3/3] phylink: Introduce phylink_fwnode_phy_connect()
Date: Mon, 27 Apr 2020 18:54:09 +0530 [thread overview]
Message-ID: <20200427132409.23664-4-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20200427132409.23664-1-calvin.johnson@oss.nxp.com>
Define phylink_fwnode_phy_connect() to connect phy specified by
a fwnode to a phylink instance. Additionally,
phylink_device_phy_connect() is defined to connect phy specified
by a device to a phylink instance.
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v2:
replace of_ and acpi_ code with generic fwnode to get phy-handle.
drivers/net/phy/phylink.c | 68 +++++++++++++++++++++++++++++++++++++++
include/linux/phylink.h | 6 ++++
2 files changed, 74 insertions(+)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 0f23bec431c1..5eab1eadded7 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -961,6 +961,74 @@ int phylink_connect_phy(struct phylink *pl, struct phy_device *phy)
}
EXPORT_SYMBOL_GPL(phylink_connect_phy);
+/**
+ * phylink_fwnode_phy_connect() - connect the PHY specified in the fwnode.
+ * @pl: a pointer to a &struct phylink returned from phylink_create()
+ * @fwnode: a pointer to a &struct fwnode_handle.
+ * @flags: PHY-specific flags to communicate to the PHY device driver
+ *
+ * Connect the phy specified @fwnode to the phylink instance specified
+ * by @pl. Actions specified in phylink_connect_phy() will be
+ * performed.
+ *
+ * Returns 0 on success or a negative errno.
+ */
+int phylink_fwnode_phy_connect(struct phylink *pl,
+ struct fwnode_handle *fwnode,
+ u32 flags)
+{
+ struct fwnode_handle *phy_fwnode;
+ struct phy_device *phy_dev;
+ int ret = 0;
+
+ /* Fixed links and 802.3z are handled without needing a PHY */
+ if (pl->cfg_link_an_mode == MLO_AN_FIXED ||
+ (pl->cfg_link_an_mode == MLO_AN_INBAND &&
+ phy_interface_mode_is_8023z(pl->link_interface)))
+ return 0;
+
+ phy_fwnode = fwnode_get_phy_node(fwnode);
+ if ((IS_ERR_OR_NULL(phy_fwnode)) && (pl->cfg_link_an_mode == MLO_AN_PHY))
+ return -ENODEV;
+
+ phy_dev = fwnode_phy_find_device(phy_fwnode);
+ fwnode_handle_put(phy_fwnode);
+ if (!phy_dev)
+ return -ENODEV;
+
+ ret = phy_attach_direct(pl->netdev, phy_dev, flags,
+ pl->link_interface);
+ if (ret)
+ return ret;
+
+ ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);
+ if (ret)
+ phy_detach(phy_dev);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(phylink_fwnode_phy_connect);
+
+/**
+ * phylink_device_phy_connect() - connect the PHY specified by the device.
+ * @pl: a pointer to a &struct phylink returned from phylink_create()
+ * @dev: a pointer to a &struct device.
+ * @flags: PHY-specific flags to communicate to the PHY device driver
+ *
+ * Connect the phy specified by the device to the phylink instance specified
+ * by @pl. Actions specified in phylink_connect_phy() will be
+ * performed.
+ *
+ * Returns 0 on success or a negative errno.
+ */
+int phylink_device_phy_connect(struct phylink *pl,
+ struct device *dev,
+ u32 flags)
+{
+ return phylink_fwnode_phy_connect(pl, dev_fwnode(dev), flags);
+}
+EXPORT_SYMBOL_GPL(phylink_device_phy_connect);
+
/**
* phylink_of_phy_connect() - connect the PHY specified in the DT mode.
* @pl: a pointer to a &struct phylink returned from phylink_create()
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index cc5b452a184e..c2bd0ee9dd9c 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -367,6 +367,12 @@ void phylink_add_pcs(struct phylink *, const struct phylink_pcs_ops *ops);
void phylink_destroy(struct phylink *);
int phylink_connect_phy(struct phylink *, struct phy_device *);
+int phylink_fwnode_phy_connect(struct phylink *pl,
+ struct fwnode_handle *fwnode,
+ u32 flags);
+int phylink_device_phy_connect(struct phylink *pl,
+ struct device *dev,
+ u32 flags);
int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags);
void phylink_disconnect_phy(struct phylink *);
--
2.17.1
next prev parent reply other threads:[~2020-04-27 13:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 13:24 [net-next PATCH v2 0/3] Introduce new APIs to support phylink and phy layers Calvin Johnson
2020-04-27 13:24 ` [net-next PATCH v2 1/3] device property: Introduce phy related fwnode functions Calvin Johnson
2020-04-27 13:36 ` Russell King - ARM Linux admin
2020-04-27 13:41 ` Russell King - ARM Linux admin
2020-04-27 13:24 ` [net-next PATCH v2 2/3] net: phy: alphabetically sort header includes Calvin Johnson
2020-04-27 13:24 ` Calvin Johnson [this message]
2020-04-27 13:56 ` [net-next PATCH v2 3/3] phylink: Introduce phylink_fwnode_phy_connect() Russell King - ARM Linux admin
2020-04-27 13:58 ` [net-next PATCH v2 0/3] Introduce new APIs to support phylink and phy layers Russell King - ARM Linux admin
2020-04-27 14:32 ` Calvin Johnson
2020-04-27 14:48 ` Russell King - ARM Linux admin
2020-04-27 14:56 ` Calvin Johnson
2020-04-29 5:37 ` Calvin Johnson
2020-04-29 10:26 ` Rafael J. Wysocki
2020-05-06 12:49 ` Calvin Johnson
2020-04-30 12:05 ` 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=20200427132409.23664-4-calvin.johnson@oss.nxp.com \
--to=calvin.johnson@oss.nxp.com \
--cc=V.Sethi@nxp.com \
--cc=andrew@lunn.ch \
--cc=andy.shevchenko@gmail.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=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=jeremy.linton@arm.com \
--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=makarand.pawagi@nxp.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=pankaj.bansal@nxp.com \
--cc=rajesh.bikkina@nxp.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).