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: Diana Madalina Craciun <diana.craciun@nxp.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
Laurentiu Tudor <laurentiu.tudor@nxp.com>,
linux-acpi@vger.kernel.org, linux.cj@gmail.com,
linux-arm-kernel@lists.infradead.org,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jakub Kicinski <kuba@kernel.org>
Subject: [net-next PATCH v3 13/15] phylink: introduce phylink_fwnode_phy_connect()
Date: Tue, 12 Jan 2021 19:10:52 +0530 [thread overview]
Message-ID: <20210112134054.342-14-calvin.johnson@oss.nxp.com> (raw)
In-Reply-To: <20210112134054.342-1-calvin.johnson@oss.nxp.com>
Define phylink_fwnode_phy_connect() to connect phy specified by
a fwnode to a phylink instance.
Signed-off-by: Calvin Johnson <calvin.johnson@oss.nxp.com>
---
Changes in v3: None
Changes in v2: None
drivers/net/phy/phylink.c | 54 +++++++++++++++++++++++++++++++++++++++
include/linux/phylink.h | 3 +++
2 files changed, 57 insertions(+)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 84f6e197f965..389dc3ec165e 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -5,6 +5,7 @@
*
* Copyright (C) 2015 Russell King
*/
+#include <linux/acpi.h>
#include <linux/ethtool.h>
#include <linux/export.h>
#include <linux/gpio/consumer.h>
@@ -1120,6 +1121,59 @@ int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn,
}
EXPORT_SYMBOL_GPL(phylink_of_phy_connect);
+/**
+ * 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.
+ *
+ * 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;
+
+ if (is_of_node(fwnode)) {
+ /* 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(phy_fwnode)) {
+ if (pl->cfg_link_an_mode == MLO_AN_PHY)
+ return -ENODEV;
+ return 0;
+ }
+
+ phy_dev = fwnode_phy_find_device(phy_fwnode);
+ /* We're done with the phy_node handle */
+ 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_disconnect_phy() - disconnect any PHY attached to the phylink
* instance.
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index d81a714cfbbd..75d4f99090fd 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -439,6 +439,9 @@ void phylink_destroy(struct phylink *);
int phylink_connect_phy(struct phylink *, struct phy_device *);
int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags);
+int phylink_fwnode_phy_connect(struct phylink *pl,
+ struct fwnode_handle *fwnode,
+ u32 flags);
void phylink_disconnect_phy(struct phylink *);
void phylink_mac_change(struct phylink *, bool up);
--
2.17.1
next prev parent reply other threads:[~2021-01-12 13:44 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 13:40 [net-next PATCH v3 00/15] ACPI support for dpaa2 driver Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 01/15] Documentation: ACPI: DSD: Document MDIO PHY Calvin Johnson
2021-01-18 22:12 ` Randy Dunlap
2021-01-12 13:40 ` [net-next PATCH v3 02/15] net: phy: Introduce fwnode_mdio_find_device() Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 03/15] net: phy: Introduce phy related fwnode functions Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 04/15] of: mdio: Refactor of_phy_find_device() Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 05/15] net: phy: Introduce fwnode_get_phy_id() Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 06/15] of: mdio: Refactor of_get_phy_id() Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 07/15] net: mdiobus: Introduce fwnode_mdiobus_register_phy() Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 08/15] of: mdio: Refactor of_mdiobus_register_phy() Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 09/15] device property: Introduce fwnode_get_id() Calvin Johnson
2021-01-12 15:48 ` Andy Shevchenko
2021-01-20 18:17 ` Rafael J. Wysocki
2021-01-20 18:45 ` Andy Shevchenko
2021-01-20 19:12 ` Rafael J. Wysocki
2021-01-12 17:30 ` Saravana Kannan
2021-01-12 18:03 ` Andy Shevchenko
2021-01-20 18:18 ` Rafael J. Wysocki
2021-01-20 18:52 ` Andy Shevchenko
2021-01-20 19:15 ` Rafael J. Wysocki
2021-01-20 20:01 ` Saravana Kannan
2021-01-22 16:34 ` Rafael J. Wysocki
2021-01-22 20:58 ` Saravana Kannan
2021-01-22 21:06 ` Andy Shevchenko
2021-01-22 21:07 ` Saravana Kannan
2021-01-15 10:47 ` Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 10/15] net: mdio: Add ACPI support code for mdio Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 11/15] net: mdiobus: Introduce fwnode_mdiobus_register() Calvin Johnson
2021-01-12 15:52 ` Andy Shevchenko
2021-01-12 13:40 ` [net-next PATCH v3 12/15] net/fsl: Use fwnode_mdiobus_register() Calvin Johnson
2021-01-12 15:53 ` Andy Shevchenko
2021-01-12 13:40 ` Calvin Johnson [this message]
2021-01-12 15:55 ` [net-next PATCH v3 13/15] phylink: introduce phylink_fwnode_phy_connect() Andy Shevchenko
2021-01-19 4:05 ` Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 14/15] net: phylink: Refactor phylink_of_phy_connect() Calvin Johnson
2021-01-12 15:57 ` Andy Shevchenko
2021-01-19 4:08 ` Calvin Johnson
2021-01-12 13:40 ` [net-next PATCH v3 15/15] 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=20210112134054.342-14-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=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=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 \
/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).