* FAILED: patch "[PATCH] iio: adc: ad7124: fix DT configuration parsing" failed to apply to 6.6-stable tree
@ 2024-09-09 6:55 gregkh
2024-09-10 8:54 ` [PATCH 6.6.y] iio: adc: ad7124: fix DT configuration parsing He Lugang
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: gregkh @ 2024-09-09 6:55 UTC (permalink / raw)
To: mitrutzceclan, Jonathan.Cameron, Stable, dumitru.ceclan, nuno.sa; +Cc: stable
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 61cbfb5368dd50ed0d65ce21d305aa923581db2b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024090914-province-underdone-1eea@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
61cbfb5368dd ("iio: adc: ad7124: fix DT configuration parsing")
a6eaf02b8274 ("iio: adc: ad7124: Switch from of specific to fwnode based property handling")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 61cbfb5368dd50ed0d65ce21d305aa923581db2b Mon Sep 17 00:00:00 2001
From: Dumitru Ceclan <mitrutzceclan@gmail.com>
Date: Tue, 6 Aug 2024 11:51:33 +0300
Subject: [PATCH] iio: adc: ad7124: fix DT configuration parsing
The cfg pointer is set before reading the channel number that the
configuration should point to. This causes configurations to be shifted
by one channel.
For example setting bipolar to the first channel defined in the DT will
cause bipolar mode to be active on the second defined channel.
Fix by moving the cfg pointer setting after reading the channel number.
Fixes: 7b8d045e497a ("iio: adc: ad7124: allow more than 8 channels")
Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240806085133.114547-1-dumitru.ceclan@analog.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index afb5f4d741e6..108e9ccab1ef 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -844,8 +844,6 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels = channels;
device_for_each_child_node_scoped(dev, child) {
- cfg = &st->channels[channel].cfg;
-
ret = fwnode_property_read_u32(child, "reg", &channel);
if (ret)
return ret;
@@ -863,6 +861,7 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
AD7124_CHANNEL_AINM(ain[1]);
+ cfg = &st->channels[channel].cfg;
cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6.6.y] iio: adc: ad7124: fix DT configuration parsing
2024-09-09 6:55 FAILED: patch "[PATCH] iio: adc: ad7124: fix DT configuration parsing" failed to apply to 6.6-stable tree gregkh
@ 2024-09-10 8:54 ` He Lugang
2024-09-10 9:07 ` [PATCH 6.6.y 1/2] iio: adc: ad7124: Switch from of specific to fwnode based property handling He Lugang
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: He Lugang @ 2024-09-10 8:54 UTC (permalink / raw)
To: stable
Cc: Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Stable, Jonathan Cameron,
He Lugang
From: Dumitru Ceclan <mitrutzceclan@gmail.com>
From: Dumitru Ceclan <dumitru.ceclan@analog.com>
[ Upstream commit 61cbfb5368dd50ed0d65ce21d305aa923581db2b ]
The cfg pointer is set before reading the channel number that the
configuration should point to. This causes configurations to be shifted
by one channel.
For example setting bipolar to the first channel defined in the DT will
cause bipolar mode to be active on the second defined channel.
Fix by moving the cfg pointer setting after reading the channel number.
Fixes: 7b8d045e497a ("iio: adc: ad7124: allow more than 8 channels")
Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240806085133.114547-1-dumitru.ceclan@analog.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: He Lugang <helugang@uniontech.com>
---
drivers/iio/adc/ad7124.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index e7b1d517d3de..089398a7664a 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -837,8 +837,6 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels = channels;
device_for_each_child_node_scoped(dev, child) {
- cfg = &st->channels[channel].cfg;
-
ret = fwnode_property_read_u32(child, "reg", &channel);
if (ret)
return ret;
@@ -856,6 +854,7 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
AD7124_CHANNEL_AINM(ain[1]);
+ cfg = &st->channels[channel].cfg;
cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6.6.y 1/2] iio: adc: ad7124: Switch from of specific to fwnode based property handling
2024-09-09 6:55 FAILED: patch "[PATCH] iio: adc: ad7124: fix DT configuration parsing" failed to apply to 6.6-stable tree gregkh
2024-09-10 8:54 ` [PATCH 6.6.y] iio: adc: ad7124: fix DT configuration parsing He Lugang
@ 2024-09-10 9:07 ` He Lugang
[not found] ` <20240910090757.649865-1-helugang@uniontech.com>
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: He Lugang @ 2024-09-10 9:07 UTC (permalink / raw)
To: stable
Cc: He Lugang, Lars-Peter Clausen, Michael Hennerich, Andy Shevchenko,
Jonathan Cameron
From:Jonathan Cameron <Jonathan.Cameron@huawei.com>
[ Upstream commit a6eaf02b82744b424b9b2c74847282deb2c6f77b ]
Using the generic firmware data access functions from property.h
provides a number of advantages:
1) Works with different firmware types.
2) Doesn't provide a 'bad' example for new IIO drivers.
3) Lets us use the new _scoped() loops with automatic reference count
cleanup for fwnode_handle
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Michael Hennerich <Michael.Hennerich@analog.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240218172731.1023367-4-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: He Lugang <helugang@uniontech.com>
---
drivers/iio/adc/ad7124.c | 55 +++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 32 deletions(-)
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index b9b206fcd748..e7b1d517d3de 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -14,7 +14,8 @@
#include <linux/kernel.h>
#include <linux/kfifo.h>
#include <linux/module.h>
-#include <linux/of.h>
+#include <linux/mod_devicetable.h>
+#include <linux/property.h>
#include <linux/regulator/consumer.h>
#include <linux/spi/spi.h>
@@ -807,22 +808,19 @@ static int ad7124_check_chip_id(struct ad7124_state *st)
return 0;
}
-static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
- struct device_node *np)
+static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
+ struct device *dev)
{
struct ad7124_state *st = iio_priv(indio_dev);
struct ad7124_channel_config *cfg;
struct ad7124_channel *channels;
- struct device_node *child;
struct iio_chan_spec *chan;
unsigned int ain[2], channel = 0, tmp;
int ret;
- st->num_channels = of_get_available_child_count(np);
- if (!st->num_channels) {
- dev_err(indio_dev->dev.parent, "no channel children\n");
- return -ENODEV;
- }
+ st->num_channels = device_get_child_node_count(dev);
+ if (!st->num_channels)
+ return dev_err_probe(dev, -ENODEV, "no channel children\n");
chan = devm_kcalloc(indio_dev->dev.parent, st->num_channels,
sizeof(*chan), GFP_KERNEL);
@@ -838,39 +836,38 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
indio_dev->num_channels = st->num_channels;
st->channels = channels;
- for_each_available_child_of_node(np, child) {
+ device_for_each_child_node_scoped(dev, child) {
cfg = &st->channels[channel].cfg;
- ret = of_property_read_u32(child, "reg", &channel);
+ ret = fwnode_property_read_u32(child, "reg", &channel);
if (ret)
- goto err;
+ return ret;
- if (channel >= indio_dev->num_channels) {
- dev_err(indio_dev->dev.parent,
+ if (channel >= indio_dev->num_channels)
+ return dev_err_probe(dev, -EINVAL,
"Channel index >= number of channels\n");
- ret = -EINVAL;
- goto err;
- }
- ret = of_property_read_u32_array(child, "diff-channels",
- ain, 2);
+ ret = fwnode_property_read_u32_array(child, "diff-channels",
+ ain, 2);
if (ret)
- goto err;
+ return ret;
st->channels[channel].nr = channel;
st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
AD7124_CHANNEL_AINM(ain[1]);
- cfg->bipolar = of_property_read_bool(child, "bipolar");
+ cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
- ret = of_property_read_u32(child, "adi,reference-select", &tmp);
+ ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
if (ret)
cfg->refsel = AD7124_INT_REF;
else
cfg->refsel = tmp;
- cfg->buf_positive = of_property_read_bool(child, "adi,buffered-positive");
- cfg->buf_negative = of_property_read_bool(child, "adi,buffered-negative");
+ cfg->buf_positive =
+ fwnode_property_read_bool(child, "adi,buffered-positive");
+ cfg->buf_negative =
+ fwnode_property_read_bool(child, "adi,buffered-negative");
chan[channel] = ad7124_channel_template;
chan[channel].address = channel;
@@ -880,10 +877,6 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
}
return 0;
-err:
- of_node_put(child);
-
- return ret;
}
static int ad7124_setup(struct ad7124_state *st)
@@ -943,9 +936,7 @@ static int ad7124_probe(struct spi_device *spi)
struct iio_dev *indio_dev;
int i, ret;
- info = of_device_get_match_data(&spi->dev);
- if (!info)
- info = (void *)spi_get_device_id(spi)->driver_data;
+ info = spi_get_device_match_data(spi);
if (!info)
return -ENODEV;
@@ -965,7 +956,7 @@ static int ad7124_probe(struct spi_device *spi)
if (ret < 0)
return ret;
- ret = ad7124_of_parse_channel_config(indio_dev, spi->dev.of_node);
+ ret = ad7124_parse_channel_config(indio_dev, &spi->dev);
if (ret < 0)
return ret;
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing
[not found] ` <20240910090757.649865-1-helugang@uniontech.com>
@ 2024-09-10 9:07 ` He Lugang
2024-09-10 9:23 ` Greg KH
0 siblings, 1 reply; 10+ messages in thread
From: He Lugang @ 2024-09-10 9:07 UTC (permalink / raw)
To: stable
Cc: Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Stable, Jonathan Cameron,
He Lugang
From: Dumitru Ceclan <mitrutzceclan@gmail.com>
From: Dumitru Ceclan <dumitru.ceclan@analog.com>
[ Upstream commit 61cbfb5368dd50ed0d65ce21d305aa923581db2b ]
The cfg pointer is set before reading the channel number that the
configuration should point to. This causes configurations to be shifted
by one channel.
For example setting bipolar to the first channel defined in the DT will
cause bipolar mode to be active on the second defined channel.
Fix by moving the cfg pointer setting after reading the channel number.
Fixes: 7b8d045e497a ("iio: adc: ad7124: allow more than 8 channels")
Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240806085133.114547-1-dumitru.ceclan@analog.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: He Lugang <helugang@uniontech.com>
---
drivers/iio/adc/ad7124.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index e7b1d517d3de..089398a7664a 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -837,8 +837,6 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels = channels;
device_for_each_child_node_scoped(dev, child) {
- cfg = &st->channels[channel].cfg;
-
ret = fwnode_property_read_u32(child, "reg", &channel);
if (ret)
return ret;
@@ -856,6 +854,7 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
AD7124_CHANNEL_AINM(ain[1]);
+ cfg = &st->channels[channel].cfg;
cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing
2024-09-10 9:07 ` [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing He Lugang
@ 2024-09-10 9:23 ` Greg KH
2024-09-10 9:43 ` HeLuang
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2024-09-10 9:23 UTC (permalink / raw)
To: He Lugang
Cc: stable, Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Jonathan Cameron
On Tue, Sep 10, 2024 at 05:07:57PM +0800, He Lugang wrote:
> From: Dumitru Ceclan <mitrutzceclan@gmail.com>
>
> From: Dumitru Ceclan <dumitru.ceclan@analog.com>
Why is this 2 different addresses?
And why was this sent twice?
confused,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing
2024-09-10 9:23 ` Greg KH
@ 2024-09-10 9:43 ` HeLuang
2024-09-10 10:06 ` Greg KH
0 siblings, 1 reply; 10+ messages in thread
From: HeLuang @ 2024-09-10 9:43 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Jonathan Cameron
在 2024/9/10 17:23, Greg KH 写道:
> On Tue, Sep 10, 2024 at 05:07:57PM +0800, He Lugang wrote:
>> From: Dumitru Ceclan <mitrutzceclan@gmail.com>
>>
>> From: Dumitru Ceclan <dumitru.ceclan@analog.com>
>
> Why is this 2 different addresses?
>
> And why was this sent twice?
>
> confused,
>
> greg k-h
>
Hi,greg
About the two email addresses because the email address mismatch message
from the checkpatch.pl,so I just and the signed-off-by one,should we
just ignore it?
Also pls just pass over the first patch mail because of lack of dependency.
----
Regards,
Lugang
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing
2024-09-10 9:43 ` HeLuang
@ 2024-09-10 10:06 ` Greg KH
2024-09-12 2:04 ` HeLuang
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2024-09-10 10:06 UTC (permalink / raw)
To: HeLuang; +Cc: stable, Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Jonathan Cameron
On Tue, Sep 10, 2024 at 05:43:21PM +0800, HeLuang wrote:
>
>
> 在 2024/9/10 17:23, Greg KH 写道:
> > On Tue, Sep 10, 2024 at 05:07:57PM +0800, He Lugang wrote:
> > > From: Dumitru Ceclan <mitrutzceclan@gmail.com>
> > >
> > > From: Dumitru Ceclan <dumitru.ceclan@analog.com>
> >
> > Why is this 2 different addresses?
> >
> > And why was this sent twice?
> >
> > confused,
> >
> > greg k-h
> >
>
> Hi,greg
>
> About the two email addresses because the email address mismatch message
> from the checkpatch.pl,so I just and the signed-off-by one,should we just
> ignore it?
Please use what is in the upstream commit.
> Also pls just pass over the first patch mail because of lack of dependency.
Please tell us what is going on, otherwise we get confused.
Please fix this up and resend a new series that we can take.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing
2024-09-10 10:06 ` Greg KH
@ 2024-09-12 2:04 ` HeLuang
0 siblings, 0 replies; 10+ messages in thread
From: HeLuang @ 2024-09-12 2:04 UTC (permalink / raw)
To: Greg KH; +Cc: stable, Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Jonathan Cameron
在 2024/9/10 18:06, Greg KH 写道:
> On Tue, Sep 10, 2024 at 05:43:21PM +0800, HeLuang wrote:
>>
>>
>> 在 2024/9/10 17:23, Greg KH 写道:
>>> On Tue, Sep 10, 2024 at 05:07:57PM +0800, He Lugang wrote:
>>>> From: Dumitru Ceclan <mitrutzceclan@gmail.com>
>>>>
>>>> From: Dumitru Ceclan <dumitru.ceclan@analog.com>
>>>
>>> Why is this 2 different addresses?
>>>
>>> And why was this sent twice?
>>>
>>> confused,
>>>
>>> greg k-h
>>>
>>
>> Hi,greg
>>
>> About the two email addresses because the email address mismatch message
>> from the checkpatch.pl,so I just and the signed-off-by one,should we just
>> ignore it?
>
> Please use what is in the upstream commit.
>
>> Also pls just pass over the first patch mail because of lack of dependency.
>
> Please tell us what is going on, otherwise we get confused.
Actually
61cbfb5368dd ("iio: adc: ad7124: fix DT configuration parsing")
depends on
a6eaf02b8274 ("iio: adc: ad7124: Switch from of specific to fwnode based
property handling")
so just need to cherry-pick them together!
>
> Please fix this up and resend a new series that we can take.
OK.
>
> thanks,
>
> greg k-h
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 6.6.y RESEND 1/2] iio: adc: ad7124: Switch from of specific to fwnode based property handling
2024-09-09 6:55 FAILED: patch "[PATCH] iio: adc: ad7124: fix DT configuration parsing" failed to apply to 6.6-stable tree gregkh
` (2 preceding siblings ...)
[not found] ` <20240910090757.649865-1-helugang@uniontech.com>
@ 2024-09-12 2:04 ` He Lugang
[not found] ` <20240912020439.127704-1-helugang@uniontech.com>
4 siblings, 0 replies; 10+ messages in thread
From: He Lugang @ 2024-09-12 2:04 UTC (permalink / raw)
To: stable
Cc: Jonathan Cameron, Lars-Peter Clausen, Michael Hennerich,
Andy Shevchenko, He Lugang
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
commit a6eaf02b82744b424b9b2c74847282deb2c6f77b upstream
Using the generic firmware data access functions from property.h
provides a number of advantages:
1) Works with different firmware types.
2) Doesn't provide a 'bad' example for new IIO drivers.
3) Lets us use the new _scoped() loops with automatic reference count
cleanup for fwnode_handle
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Michael Hennerich <Michael.Hennerich@analog.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240218172731.1023367-4-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: He Lugang <helugang@uniontech.com>
---
drivers/iio/adc/ad7124.c | 55 +++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 32 deletions(-)
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index b9b206fcd748..e7b1d517d3de 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -14,7 +14,8 @@
#include <linux/kernel.h>
#include <linux/kfifo.h>
#include <linux/module.h>
-#include <linux/of.h>
+#include <linux/mod_devicetable.h>
+#include <linux/property.h>
#include <linux/regulator/consumer.h>
#include <linux/spi/spi.h>
@@ -807,22 +808,19 @@ static int ad7124_check_chip_id(struct ad7124_state *st)
return 0;
}
-static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
- struct device_node *np)
+static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
+ struct device *dev)
{
struct ad7124_state *st = iio_priv(indio_dev);
struct ad7124_channel_config *cfg;
struct ad7124_channel *channels;
- struct device_node *child;
struct iio_chan_spec *chan;
unsigned int ain[2], channel = 0, tmp;
int ret;
- st->num_channels = of_get_available_child_count(np);
- if (!st->num_channels) {
- dev_err(indio_dev->dev.parent, "no channel children\n");
- return -ENODEV;
- }
+ st->num_channels = device_get_child_node_count(dev);
+ if (!st->num_channels)
+ return dev_err_probe(dev, -ENODEV, "no channel children\n");
chan = devm_kcalloc(indio_dev->dev.parent, st->num_channels,
sizeof(*chan), GFP_KERNEL);
@@ -838,39 +836,38 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
indio_dev->num_channels = st->num_channels;
st->channels = channels;
- for_each_available_child_of_node(np, child) {
+ device_for_each_child_node_scoped(dev, child) {
cfg = &st->channels[channel].cfg;
- ret = of_property_read_u32(child, "reg", &channel);
+ ret = fwnode_property_read_u32(child, "reg", &channel);
if (ret)
- goto err;
+ return ret;
- if (channel >= indio_dev->num_channels) {
- dev_err(indio_dev->dev.parent,
+ if (channel >= indio_dev->num_channels)
+ return dev_err_probe(dev, -EINVAL,
"Channel index >= number of channels\n");
- ret = -EINVAL;
- goto err;
- }
- ret = of_property_read_u32_array(child, "diff-channels",
- ain, 2);
+ ret = fwnode_property_read_u32_array(child, "diff-channels",
+ ain, 2);
if (ret)
- goto err;
+ return ret;
st->channels[channel].nr = channel;
st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
AD7124_CHANNEL_AINM(ain[1]);
- cfg->bipolar = of_property_read_bool(child, "bipolar");
+ cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
- ret = of_property_read_u32(child, "adi,reference-select", &tmp);
+ ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
if (ret)
cfg->refsel = AD7124_INT_REF;
else
cfg->refsel = tmp;
- cfg->buf_positive = of_property_read_bool(child, "adi,buffered-positive");
- cfg->buf_negative = of_property_read_bool(child, "adi,buffered-negative");
+ cfg->buf_positive =
+ fwnode_property_read_bool(child, "adi,buffered-positive");
+ cfg->buf_negative =
+ fwnode_property_read_bool(child, "adi,buffered-negative");
chan[channel] = ad7124_channel_template;
chan[channel].address = channel;
@@ -880,10 +877,6 @@ static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev,
}
return 0;
-err:
- of_node_put(child);
-
- return ret;
}
static int ad7124_setup(struct ad7124_state *st)
@@ -943,9 +936,7 @@ static int ad7124_probe(struct spi_device *spi)
struct iio_dev *indio_dev;
int i, ret;
- info = of_device_get_match_data(&spi->dev);
- if (!info)
- info = (void *)spi_get_device_id(spi)->driver_data;
+ info = spi_get_device_match_data(spi);
if (!info)
return -ENODEV;
@@ -965,7 +956,7 @@ static int ad7124_probe(struct spi_device *spi)
if (ret < 0)
return ret;
- ret = ad7124_of_parse_channel_config(indio_dev, spi->dev.of_node);
+ ret = ad7124_parse_channel_config(indio_dev, &spi->dev);
if (ret < 0)
return ret;
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6.6.y RESEND 2/2] iio: adc: ad7124: fix DT configuration parsing
[not found] ` <20240912020439.127704-1-helugang@uniontech.com>
@ 2024-09-12 2:04 ` He Lugang
0 siblings, 0 replies; 10+ messages in thread
From: He Lugang @ 2024-09-12 2:04 UTC (permalink / raw)
To: stable
Cc: Dumitru Ceclan, Dumitru Ceclan, Nuno Sa, Stable, Jonathan Cameron,
He Lugang
From: Dumitru Ceclan <mitrutzceclan@gmail.com>
commit 61cbfb5368dd50ed0d65ce21d305aa923581db2b upstream
The cfg pointer is set before reading the channel number that the
configuration should point to. This causes configurations to be shifted
by one channel.
For example setting bipolar to the first channel defined in the DT will
cause bipolar mode to be active on the second defined channel.
Fix by moving the cfg pointer setting after reading the channel number.
Fixes: 7b8d045e497a ("iio: adc: ad7124: allow more than 8 channels")
Signed-off-by: Dumitru Ceclan <dumitru.ceclan@analog.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240806085133.114547-1-dumitru.ceclan@analog.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: He Lugang <helugang@uniontech.com>
---
drivers/iio/adc/ad7124.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c
index e7b1d517d3de..089398a7664a 100644
--- a/drivers/iio/adc/ad7124.c
+++ b/drivers/iio/adc/ad7124.c
@@ -837,8 +837,6 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels = channels;
device_for_each_child_node_scoped(dev, child) {
- cfg = &st->channels[channel].cfg;
-
ret = fwnode_property_read_u32(child, "reg", &channel);
if (ret)
return ret;
@@ -856,6 +854,7 @@ static int ad7124_parse_channel_config(struct iio_dev *indio_dev,
st->channels[channel].ain = AD7124_CHANNEL_AINP(ain[0]) |
AD7124_CHANNEL_AINM(ain[1]);
+ cfg = &st->channels[channel].cfg;
cfg->bipolar = fwnode_property_read_bool(child, "bipolar");
ret = fwnode_property_read_u32(child, "adi,reference-select", &tmp);
--
2.45.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-09-12 2:06 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-09 6:55 FAILED: patch "[PATCH] iio: adc: ad7124: fix DT configuration parsing" failed to apply to 6.6-stable tree gregkh
2024-09-10 8:54 ` [PATCH 6.6.y] iio: adc: ad7124: fix DT configuration parsing He Lugang
2024-09-10 9:07 ` [PATCH 6.6.y 1/2] iio: adc: ad7124: Switch from of specific to fwnode based property handling He Lugang
[not found] ` <20240910090757.649865-1-helugang@uniontech.com>
2024-09-10 9:07 ` [PATCH 6.6.y 2/2] iio: adc: ad7124: fix DT configuration parsing He Lugang
2024-09-10 9:23 ` Greg KH
2024-09-10 9:43 ` HeLuang
2024-09-10 10:06 ` Greg KH
2024-09-12 2:04 ` HeLuang
2024-09-12 2:04 ` [PATCH 6.6.y RESEND 1/2] iio: adc: ad7124: Switch from of specific to fwnode based property handling He Lugang
[not found] ` <20240912020439.127704-1-helugang@uniontech.com>
2024-09-12 2:04 ` [PATCH 6.6.y RESEND 2/2] iio: adc: ad7124: fix DT configuration parsing He Lugang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox