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>, Paolo Abeni <pabeni@redhat.com>
Cc: "Hans de Goede" <hdegoede@redhat.com>,
"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Allan Nielsen" <allan.nielsen@microchip.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-i2c@vger.kernel.org, netdev@vger.kernel.org,
"Clément Léger" <clement.leger@bootlin.com>
Subject: [PATCH 5/6] i2c: mux: add support for fwnode
Date: Fri, 18 Mar 2022 17:00:58 +0100 [thread overview]
Message-ID: <20220318160059.328208-13-clement.leger@bootlin.com> (raw)
In-Reply-To: <20220318160059.328208-1-clement.leger@bootlin.com>
Modify i2c_mux_add_adapter() to use with fwnode API to allow creating
mux adapters with fwnode based devices. This allows to have a node
independent support for i2c muxes.
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
---
drivers/i2c/i2c-mux.c | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 774507b54b57..93c916220da5 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -24,7 +24,7 @@
#include <linux/i2c-mux.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/of.h>
+#include <linux/property.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
@@ -347,38 +347,35 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
else
priv->adap.class = class;
- /*
- * Try to populate the mux adapter's of_node, expands to
- * nothing if !CONFIG_OF.
- */
- if (muxc->dev->of_node) {
- struct device_node *dev_node = muxc->dev->of_node;
- struct device_node *mux_node, *child = NULL;
+ /* Try to populate the mux adapter's device node */
+ if (dev_fwnode(muxc->dev) && !has_acpi_companion(muxc->dev)) {
+ struct fwnode_handle *dev_node = dev_fwnode(muxc->dev);
+ struct fwnode_handle *mux_node, *child = NULL;
u32 reg;
if (muxc->arbitrator)
- mux_node = of_get_child_by_name(dev_node, "i2c-arb");
+ mux_node = fwnode_get_named_child_node(dev_node, "i2c-arb");
else if (muxc->gate)
- mux_node = of_get_child_by_name(dev_node, "i2c-gate");
+ mux_node = fwnode_get_named_child_node(dev_node, "i2c-gate");
else
- mux_node = of_get_child_by_name(dev_node, "i2c-mux");
+ mux_node = fwnode_get_named_child_node(dev_node, "i2c-mux");
if (mux_node) {
/* A "reg" property indicates an old-style DT entry */
- if (!of_property_read_u32(mux_node, "reg", ®)) {
- of_node_put(mux_node);
+ if (!fwnode_property_read_u32(mux_node, "reg", ®)) {
+ fwnode_handle_put(mux_node);
mux_node = NULL;
}
}
if (!mux_node)
- mux_node = of_node_get(dev_node);
+ mux_node = fwnode_handle_get(dev_node);
else if (muxc->arbitrator || muxc->gate)
- child = of_node_get(mux_node);
+ child = fwnode_handle_get(mux_node);
if (!child) {
- for_each_child_of_node(mux_node, child) {
- ret = of_property_read_u32(child, "reg", ®);
+ fwnode_for_each_child_node(mux_node, child) {
+ ret = fwnode_property_read_u32(child, "reg", ®);
if (ret)
continue;
if (chan_id == reg)
@@ -386,8 +383,8 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
}
}
- priv->adap.dev.of_node = child;
- of_node_put(mux_node);
+ device_set_node(&priv->adap.dev, child);
+ fwnode_handle_put(mux_node);
}
/*
@@ -444,7 +441,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)
while (muxc->num_adapters) {
struct i2c_adapter *adap = muxc->adapter[--muxc->num_adapters];
struct i2c_mux_priv *priv = adap->algo_data;
- struct device_node *np = adap->dev.of_node;
+ struct fwnode_handle *np = dev_fwnode(&adap->dev);
muxc->adapter[muxc->num_adapters] = NULL;
@@ -454,7 +451,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)
sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
i2c_del_adapter(adap);
- of_node_put(np);
+ fwnode_handle_put(np);
kfree(priv);
}
}
--
2.34.1
next prev parent reply other threads:[~2022-03-18 16:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 16:00 [PATCH 0/6] introduce fwnode in the I2C subsystem Clément Léger
2022-03-18 16:00 ` [PATCH 1/6] property: add fwnode_property_read_string_index() Clément Léger
2022-03-18 16:26 ` Andy Shevchenko
2022-03-18 16:49 ` Clément Léger
2022-03-18 18:09 ` Andy Shevchenko
2022-03-21 7:49 ` Clément Léger
2022-03-21 10:31 ` Andy Shevchenko
2022-03-21 10:33 ` Clément Léger
2022-03-18 16:00 ` [PATCH 2/6] i2c: fwnode: add fwnode_find_i2c_adapter_by_node() Clément Léger
2022-03-18 16:29 ` Andy Shevchenko
2022-03-18 16:54 ` Clément Léger
2022-03-18 16:00 ` [PATCH 3/6] i2c: of: use fwnode_get_i2c_adapter_by_node() Clément Léger
2022-03-18 16:00 ` [PATCH 4/6] i2c: mux: pinctrl: remove CONFIG_OF dependency and use fwnode API Clément Léger
2022-03-18 16:28 ` Andy Shevchenko
2022-03-18 16:56 ` Clément Léger
2022-03-18 18:11 ` Andy Shevchenko
2022-03-18 16:00 ` [PATCH 5/6] i2c: mux: add support for fwnode Clément Léger
2022-03-18 16:00 ` [PATCH 6/6] net: sfp: " Clément Léger
2022-03-18 16:32 ` Andy Shevchenko
2022-03-18 16:58 ` Clément Léger
2022-03-18 16:00 ` [PATCH 0/6] introduce fwnode in the I2C subsystem Clément Léger
2022-03-18 16:00 ` [PATCH 1/6] property: add fwnode_property_read_string_index() Clément Léger
2022-03-18 16:00 ` [PATCH 2/6] i2c: fwnode: add fwnode_find_i2c_adapter_by_node() Clément Léger
2022-03-18 16:00 ` [PATCH 3/6] i2c: of: use fwnode_get_i2c_adapter_by_node() Clément Léger
2022-03-18 16:00 ` [PATCH 4/6] i2c: mux: pinctrl: remove CONFIG_OF dependency and use fwnode API Clément Léger
2022-03-18 16:00 ` Clément Léger [this message]
2022-03-18 16:00 ` [PATCH 6/6] net: sfp: add support for fwnode Clément Léger
2022-03-18 16:24 ` [PATCH 0/6] introduce fwnode in the I2C subsystem Andy Shevchenko
2022-03-18 16:59 ` Clément Léger
2022-03-18 17:02 ` Jakub Kicinski
2022-03-21 10:56 ` Clément Léger
2022-03-21 18:36 ` Jakub Kicinski
2022-03-22 7:52 ` 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=20220318160059.328208-13-clement.leger@bootlin.com \
--to=clement.leger@bootlin.com \
--cc=alexandre.belloni@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=andrew@lunn.ch \
--cc=andriy.shevchenko@linux.intel.com \
--cc=davem@davemloft.net \
--cc=djrscally@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--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=pabeni@redhat.com \
--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).