From: "Clément Léger" <clement.leger@bootlin.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Daniel Scally <djrscally@gmail.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Wolfram Sang <wsa@kernel.org>, Peter Rosin <peda@axentia.se>,
Russell King <linux@armlinux.org.uk>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-i2c@vger.kernel.org, netdev@vger.kernel.org,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Clément Léger" <clement.leger@bootlin.com>
Subject: [RFC 10/10] net: sfp: add support for fwnode
Date: Mon, 21 Feb 2022 17:26:52 +0100 [thread overview]
Message-ID: <20220221162652.103834-11-clement.leger@bootlin.com> (raw)
In-Reply-To: <20220221162652.103834-1-clement.leger@bootlin.com>
Add support to retrieve a i2c bus in sfp with a fwnode. This support
is using the fwnode API which also works with device-tree and ACPI.
For this purpose, the device-tree and ACPI code handling the i2c
adapter retrieval was factorized with the new code. This also allows
i2c devices using a software_node description to be used by sfp code.
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
drivers/net/phy/sfp.c | 44 +++++++++++++------------------------------
1 file changed, 13 insertions(+), 31 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 4720b24ca51b..9d9e3d209408 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -2499,43 +2499,25 @@ static int sfp_probe(struct platform_device *pdev)
return err;
sff = sfp->type = &sfp_data;
+ if (dev_fwnode(&pdev->dev)) {
+ struct fwnode_handle *fwnode = dev_fwnode(&pdev->dev);
+ struct fwnode_handle *np;
- if (pdev->dev.of_node) {
- struct device_node *node = pdev->dev.of_node;
- const struct of_device_id *id;
- struct device_node *np;
+ if (!is_acpi_device_node(fwnode)) {
+ sff = device_get_match_data(&pdev->dev);
+ if (WARN_ON(!sff))
+ return -EINVAL;
- id = of_match_node(sfp_of_match, node);
- if (WARN_ON(!id))
- return -EINVAL;
-
- sff = sfp->type = id->data;
-
- np = of_parse_phandle(node, "i2c-bus", 0);
- if (!np) {
- dev_err(sfp->dev, "missing 'i2c-bus' property\n");
- return -ENODEV;
+ sfp->type = sff;
}
- i2c = of_find_i2c_adapter_by_node(np);
- of_node_put(np);
- } else if (has_acpi_companion(&pdev->dev)) {
- struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
- struct fwnode_handle *fw = acpi_fwnode_handle(adev);
- struct fwnode_reference_args args;
- struct acpi_handle *acpi_handle;
- int ret;
-
- ret = acpi_node_get_property_reference(fw, "i2c-bus", 0, &args);
- if (ret || !is_acpi_device_node(args.fwnode)) {
- dev_err(&pdev->dev, "missing 'i2c-bus' property\n");
+ np = fwnode_find_reference(fwnode, "i2c-bus", 0);
+ if (!np) {
+ dev_err(&pdev->dev, "Cannot parse i2c-bus\n");
return -ENODEV;
}
-
- acpi_handle = ACPI_HANDLE_FWNODE(args.fwnode);
- i2c = i2c_acpi_find_adapter_by_handle(acpi_handle);
- } else {
- return -EINVAL;
+ i2c = fwnode_find_i2c_adapter_by_node(np);
+ fwnode_handle_put(np);
}
if (!i2c)
--
2.34.1
next prev parent reply other threads:[~2022-02-21 16:39 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 16:26 [RFC 00/10] add support for fwnode in i2c mux system and sfp Clément Léger
2022-02-21 16:26 ` [RFC 01/10] property: add fwnode_match_node() Clément Léger
2022-02-21 17:44 ` Andy Shevchenko
2022-02-22 8:14 ` Clément Léger
2022-02-21 16:26 ` [RFC 02/10] property: add fwnode_get_match_data() Clément Léger
2022-02-21 17:46 ` Andy Shevchenko
2022-02-22 8:19 ` Clément Léger
2022-02-22 8:33 ` Andy Shevchenko
2022-02-22 8:46 ` Clément Léger
2022-02-22 9:24 ` Andy Shevchenko
2022-02-22 9:47 ` Clément Léger
2022-02-22 10:20 ` Greg Kroah-Hartman
2022-02-22 15:16 ` Clément Léger
2022-02-21 16:26 ` [RFC 03/10] base: swnode: use fwnode_get_match_data() Clément Léger
2022-02-21 17:48 ` Andy Shevchenko
2022-02-22 8:39 ` Clément Léger
2022-02-23 15:05 ` Sakari Ailus
2022-02-23 15:15 ` Clément Léger
2022-02-23 15:21 ` Sakari Ailus
2022-02-21 16:26 ` [RFC 04/10] property: add a callback parameter to fwnode_property_match_string() Clément Léger
2022-02-21 17:51 ` Andy Shevchenko
2022-02-21 16:26 ` [RFC 05/10] property: add fwnode_property_read_string_index() Clément Léger
2022-02-21 16:26 ` [RFC 06/10] i2c: fwnode: add fwnode_find_i2c_adapter_by_node() Clément Léger
2022-02-21 18:00 ` Andy Shevchenko
2022-02-21 16:26 ` [RFC 07/10] i2c: of: use fwnode_get_i2c_adapter_by_node() Clément Léger
2022-02-21 16:26 ` [RFC 08/10] i2c: mux: pinctrl: remove CONFIG_OF dependency and use fwnode API Clément Léger
2022-02-21 16:26 ` [RFC 09/10] i2c: mux: add support for fwnode Clément Léger
2022-02-21 17:55 ` Andy Shevchenko
2022-02-22 8:53 ` Clément Léger
2022-02-22 10:57 ` Andrew Lunn
2022-02-22 20:31 ` Alexandre Belloni
2022-02-21 16:26 ` Clément Léger [this message]
2022-02-21 16:45 ` [RFC 10/10] net: sfp: " Russell King (Oracle)
2022-02-21 17:57 ` Andy Shevchenko
2022-02-22 13:25 ` Clément Léger
2022-02-23 11:22 ` Andy Shevchenko
2022-02-23 12:02 ` Hans de Goede
2022-02-23 12:31 ` Andrew Lunn
2022-02-23 12:41 ` Russell King (Oracle)
2022-02-23 13:39 ` Hans de Goede
2022-02-23 14:14 ` Clément Léger
2022-02-23 15:23 ` Andrew Lunn
2022-02-23 15:27 ` Hans de Goede
2022-02-23 15:27 ` Hans de Goede
2022-02-23 15:36 ` Andy Shevchenko
2022-02-23 15:38 ` Clément Léger
2022-02-23 14:37 ` Andy Shevchenko
2022-02-21 17:41 ` [RFC 00/10] add support for fwnode in i2c mux system and sfp Andy Shevchenko
2022-02-22 16:30 ` Clément Léger
2022-02-23 14:46 ` Andy Shevchenko
2022-02-23 15:11 ` Clément Léger
2022-02-23 15:24 ` Andy Shevchenko
2022-02-23 17:41 ` Mark Brown
2022-02-23 17:59 ` Clément Léger
2022-02-23 18:12 ` Mark Brown
2022-02-23 18:19 ` Andy Shevchenko
2022-02-21 21:44 ` Andrew Lunn
2022-02-22 8:26 ` Andy Shevchenko
2022-02-22 8:57 ` Andrew Lunn
2022-02-22 9:20 ` Andy Shevchenko
2022-02-24 14:40 ` Clément Léger
2022-02-24 14:58 ` Hans de Goede
2022-02-24 15:33 ` Mark Brown
2022-02-24 18:14 ` Sakari Ailus
2022-02-24 18:39 ` Alexandre Belloni
2022-02-24 18:43 ` Mark Brown
2022-02-24 18:39 ` Mark Brown
2022-02-24 16:42 ` Clément Léger
2022-02-24 17:26 ` Mark Brown
2022-03-03 8:48 ` Clément Léger
2022-03-03 12:26 ` Mark Brown
2022-03-08 10:45 ` Clément Léger
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=20220221162652.103834-11-clement.leger@bootlin.com \
--to=clement.leger@bootlin.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=djrscally@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=peda@axentia.se \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=wsa@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).