From: Marcin Wojtas <mw@semihalf.com>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux@armlinux.org.uk,
jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com,
Samer.El-Haj-Mahmoud@arm.com, jon@solid-run.com, tn@semihalf.com,
rjw@rjwysocki.net, lenb@kernel.org,
Marcin Wojtas <mw@semihalf.com>
Subject: [net-next: PATCH v2 2/7] net: mdiobus: Introduce fwnode_mdbiobus_register()
Date: Wed, 16 Jun 2021 21:07:54 +0200 [thread overview]
Message-ID: <20210616190759.2832033-3-mw@semihalf.com> (raw)
In-Reply-To: <20210616190759.2832033-1-mw@semihalf.com>
This patch introduces a new helper function that
wraps acpi_/of_ mdiobus_register() and allows its
usage via common fwnode_ interface.
Fall back to raw mdiobus_register() in case CONFIG_FWNODE_MDIO
is not enabled, in order to satisfy compatibility
in all future user drivers.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
include/linux/fwnode_mdio.h | 12 +++++++++++
drivers/net/mdio/fwnode_mdio.c | 22 ++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/include/linux/fwnode_mdio.h b/include/linux/fwnode_mdio.h
index faf603c48c86..13d4ae8fee0a 100644
--- a/include/linux/fwnode_mdio.h
+++ b/include/linux/fwnode_mdio.h
@@ -16,6 +16,7 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,
int fwnode_mdiobus_register_phy(struct mii_bus *bus,
struct fwnode_handle *child, u32 addr);
+int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode);
#else /* CONFIG_FWNODE_MDIO */
int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,
struct phy_device *phy,
@@ -30,6 +31,17 @@ static inline int fwnode_mdiobus_register_phy(struct mii_bus *bus,
{
return -EINVAL;
}
+
+static inline int fwnode_mdiobus_register(struct mii_bus *bus,
+ struct fwnode_handle *fwnode)
+{
+ /*
+ * Fall back to mdiobus_register() function to register a bus.
+ * This way, we don't have to keep compat bits around in drivers.
+ */
+
+ return mdiobus_register(mdio);
+}
#endif
#endif /* __LINUX_FWNODE_MDIO_H */
diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c
index e96766da8de4..b6576af89fa1 100644
--- a/drivers/net/mdio/fwnode_mdio.c
+++ b/drivers/net/mdio/fwnode_mdio.c
@@ -7,8 +7,10 @@
*/
#include <linux/acpi.h>
+#include <linux/acpi_mdio.h>
#include <linux/fwnode_mdio.h>
#include <linux/of.h>
+#include <linux/of_mdio.h>
#include <linux/phy.h>
MODULE_AUTHOR("Calvin Johnson <calvin.johnson@oss.nxp.com>");
@@ -142,3 +144,23 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,
return 0;
}
EXPORT_SYMBOL(fwnode_mdiobus_register_phy);
+
+/**
+ * fwnode_mdiobus_register - bring up all the PHYs on a given MDIO bus and
+ * attach them to it.
+ * @bus: Target MDIO bus.
+ * @fwnode: Pointer to fwnode of the MDIO controller.
+ *
+ * Return values are determined accordingly to acpi_/of_ mdiobus_register()
+ * operation.
+ */
+int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode)
+{
+ if (is_acpi_node(fwnode))
+ return acpi_mdiobus_register(bus, fwnode);
+ else if (is_of_node(fwnode))
+ return of_mdiobus_register(bus, to_of_node(fwnode));
+ else
+ return -EINVAL;
+}
+EXPORT_SYMBOL(fwnode_mdiobus_register);
--
2.29.0
next prev parent reply other threads:[~2021-06-16 19:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 19:07 [net-next: PATCH v2 0/7] ACPI MDIO support for Marvell controllers Marcin Wojtas
2021-06-16 19:07 ` [net-next: PATCH v2 1/7] Documentation: ACPI: DSD: describe additional MAC configuration Marcin Wojtas
2021-06-16 19:07 ` Marcin Wojtas [this message]
2021-06-16 19:33 ` [net-next: PATCH v2 2/7] net: mdiobus: Introduce fwnode_mdbiobus_register() Andrew Lunn
2021-06-16 23:50 ` Marcin Wojtas
2021-06-17 12:59 ` Andrew Lunn
2021-06-16 19:07 ` [net-next: PATCH v2 3/7] net/fsl: switch to fwnode_mdiobus_register Marcin Wojtas
2021-06-16 19:35 ` Andrew Lunn
2021-06-16 23:39 ` Marcin Wojtas
2021-06-17 12:27 ` Andrew Lunn
2021-06-17 13:22 ` Marcin Wojtas
2021-06-16 19:07 ` [net-next: PATCH v2 4/7] net: mvmdio: simplify clock handling Marcin Wojtas
2021-06-16 19:48 ` Andrew Lunn
2021-06-16 23:25 ` Marcin Wojtas
2021-06-17 7:28 ` Andy Shevchenko
2021-06-16 19:07 ` [net-next: PATCH v2 5/7] net: mvmdio: add ACPI support Marcin Wojtas
2021-06-16 19:51 ` Andrew Lunn
2021-06-16 22:37 ` Marcin Wojtas
2021-06-16 23:01 ` Andrew Lunn
2021-06-16 19:07 ` [net-next: PATCH v2 6/7] net: mvpp2: enable using phylink with ACPI Marcin Wojtas
2021-06-16 19:07 ` [net-next: PATCH v2 7/7] net: mvpp2: remove unused 'has_phy' field Marcin Wojtas
2021-06-16 19:54 ` Andrew Lunn
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=20210616190759.2832033-3-mw@semihalf.com \
--to=mw@semihalf.com \
--cc=Samer.El-Haj-Mahmoud@arm.com \
--cc=davem@davemloft.net \
--cc=gjb@semihalf.com \
--cc=jaz@semihalf.com \
--cc=jon@solid-run.com \
--cc=kuba@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=tn@semihalf.com \
--cc=upstream@semihalf.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).