dt-bindings: IIO: Drop wrong use of io-channel-ranges then drop it as well.

From: Jonathan Cameron <[email protected]>

io-channel-ranges is a property for io-channel consumers. Here it is in an example of a provider of channels so doesn't do anything useful.

Recent additions to dt-schema check this property is only provided alongside io-channels which is not true here and hence an error is reported.

Signed-off-by Jonathan Cameron <[email protected]>

Reported-by Rob Herring <[email protected]>

Cc Andy Gross <[email protected]>

Cc Bjorn Andersson <[email protected]>

Cc Jishnu Prakash <[email protected]>

---
 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml | 3 ---
 1 file changed, 3 deletions(-)

Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml +0 -2

index 7f4f827c57a7..95cc705b961b 100644
@@ -48,8 +48,6 @@ properties:
     description:
       End of conversion interrupt.
 
-  io-channel-ranges: true
-
 required:
   - compatible
   - reg

From: Jonathan Cameron <[email protected]>

io-channel-ranges is a property for io-channel consumers. Here it is in an example of a provider of channels so doesn't do anything useful.

Recent additions to dt-schema check this property is only provided alongside io-channels which is not true here and hence an error is reported.

Signed-off-by Jonathan Cameron <[email protected]>

Reported-by Rob Herring <[email protected]>

Cc Andy Gross <[email protected]>

Cc Bjorn Andersson <[email protected]>

Cc Jishnu Prakash <[email protected]>

---
 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml | 3 ---
 1 file changed, 3 deletions(-)

Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml +0 -3

index 7f4f827c57a7..95cc705b961b 100644
@@ -48,8 +48,6 @@ properties:
     description:
       End of conversion interrupt.
 
-  io-channel-ranges: true
-
 required:
   - compatible
   - reg

@@ -249,7 +247,6 @@ examples:
         #address-cells = <1>;
         #size-cells = <0>;
         #io-channel-cells = <1>;
-        io-channel-ranges;
 
         /* Channel node */
         adc-chan@39 {

Signature · 1 line

2.28.0

From: Jonathan Cameron <[email protected]>

io-channel-ranges is a property for consumers of io-channels, not providers. Hence it is not relevant in this binding or the examples given.

Recent changes to dt-schema result int his being reported as an error

Quoted 6 lines · Jonathan Cameron

From: Jonathan Cameron <[email protected]>

io-channel-ranges is a property for consumers of io-channels, not providers. Hence it is not relevant in this binding or the examples given.

Quoted 1 line

Recent changes to dt-schema result int his being reported as an error

s/int his/in this/

Reviewed-by Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

From: Jonathan Cameron <[email protected]>

This property applies to consumers of io-channels. In this case we have a provider so the property is not used.

Not dt_schema will now detect this as an error due to a dependency between this property and the io-channels property.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Florian Fainelli <[email protected]>

Quoted 10 lines · Jonathan Cameron

From: Jonathan Cameron <[email protected]>

This property applies to consumers of io-channels. In this case we have a provider so the property is not used.

Not dt_schema will now detect this as an error due to a dependency between this property and the io-channels property.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Florian Fainelli <[email protected]>

Applied to devicetree/next, with the second paragraph fixed to:

"""
Recent changes to dt-schema result int his being reported as an error as a dependency is enforced between this property and io-channels. """"

since it did not look like a correct sentence making sense otherwise.

PS: please make sure you run get_maintainer.pl, this patch did not land in our patchwork instance since [email protected] was not copied.

Thanks you

From: Jonathan Cameron <[email protected]>

This property is only relevant to consumers of io-channels, not providers. All these dtsi files have it alongside #io-channel-cells which indicates they are providers of io-channels, not consumers.

Note that dt_schema will now flag this up due to a dependency between this property and io-channels.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm/boot/dts/exynos3250.dtsi | 1 -
 arch/arm/boot/dts/exynos4412.dtsi | 1 -
 arch/arm/boot/dts/exynos5250.dtsi | 1 -
 arch/arm/boot/dts/exynos54xx.dtsi | 1 -
 4 files changed, 4 deletions(-)

From: Jonathan Cameron <[email protected]>

This property is relevant to consumers of io-channels. Here it is used by a provider.

dt_schema will now report and error as this property must be in the same node as io-channels and it is not here.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm/boot/dts/s5pv210.dtsi | 1 -
 1 file changed, 1 deletion(-)

From: Jonathan Cameron <[email protected]>

This property is used by io-channel consumers, not providers so should not present here. Note dt_schema will now detect this error as there is a dependency between this property and io-channels.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Andy Gross <[email protected]>

Cc Bjorn Andersson <[email protected]>

---
 arch/arm/boot/dts/qcom-pma8084.dtsi | 1 -
 1 file changed, 1 deletion(-)

arch/arm/boot/dts/qcom-pma8084.dtsi +0 -0

index ea1ca166165c..e921c5e93a5d 100644

Quoted 6 lines · On Sun, 15 Nov 2020 19:29:48 +0000 Jonathan Cameron <[email protected]> wrote:

From: Jonathan Cameron <[email protected]>

This property is used by io-channel consumers, not providers so should not present here. Note dt_schema will now detect this error as there is a dependency between this property and io-channels.

Quoted 3 lines

Signed-off-by Jonathan Cameron <[email protected]>

Cc Andy Gross <[email protected]>

Cc Bjorn Andersson <[email protected]>

+CC Andy on an up to date email. Also added linux-arm-msm which I should have cc'd in the first place.

I've taken the yaml fix related to this so just a question of cleaning up this loose end in the dtsi

Thanks,

Jonathan

Quoted 14 lines

---
 arch/arm/boot/dts/qcom-pma8084.dtsi | 1 -
 1 file changed, 1 deletion(-)

arch/arm/boot/dts/qcom-pma8084.dtsi +0 -1

index ea1ca166165c..e921c5e93a5d 100644
@@ -68,7 +68,6 @@ pma8084_vadc: vadc@3100 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			#io-channel-cells = <1>;
-			io-channel-ranges;
 

arch/arm/boot/dts/qcom-pma8084.dtsi pma8084_vadc: vadc@3100 { · line 73

Quoted 2 lines

arch/arm/boot/dts/qcom-pma8084.dtsi +0 -0

 			die_temp {
 				reg = <VADC_DIE_TEMP>;

Quoted 15 lines · Jonathan Cameron

Quoted 9 lines · On Sun, 15 Nov 2020 19:29:48 +0000 Jonathan Cameron <[email protected]> wrote:

From: Jonathan Cameron <[email protected]>

This property is used by io-channel consumers, not providers so should not present here. Note dt_schema will now detect this error as there is a dependency between this property and io-channels.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Andy Gross <[email protected]>

Cc Bjorn Andersson <[email protected]>

+CC Andy on an up to date email. Also added linux-arm-msm which I should have cc'd in the first place.

Quoted 3 lines

I've taken the yaml fix related to this so just a question of cleaning up this loose end in the dtsi

Thanks Jonathan, I missed your patches earlier. The yaml change looks correct and I've merged this for 5.11.

Regards,
Bjorn

Quoted 21 lines

Thanks,

Jonathan

Quoted 16 lines

---
 arch/arm/boot/dts/qcom-pma8084.dtsi | 1 -
 1 file changed, 1 deletion(-)

arch/arm/boot/dts/qcom-pma8084.dtsi +0 -1

index ea1ca166165c..e921c5e93a5d 100644
@@ -68,7 +68,6 @@ pma8084_vadc: vadc@3100 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			#io-channel-cells = <1>;
-			io-channel-ranges;
 
 			die_temp {
 				reg = <VADC_DIE_TEMP>;  

From: Jonathan Cameron <[email protected]>

This property is only useful if a node has children as it allows them to then use io-channel properties in the parent. Here there are no children.

This is harmless, but we are planning to shortly drop this property as it is rarely used correctly and there is little reason it would ever be needed as we can just provide the io-channels property to any child nodes that need it.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm/boot/dts/s5pv210-aries.dtsi | 1 -
 1 file changed, 1 deletion(-)

From: Jonathan Cameron <[email protected]>

This property is for consumers of io-channels. Here it is used in providers of those channels.

Note dt_schema will currently flag this as an error due to a dependency between this property and io-channels.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 -
 arch/arm64/boot/dts/exynos/exynos7.dtsi    | 1 -
 2 files changed, 2 deletions(-)

From: Jonathan Cameron <[email protected]>

This property has been almost exclusively missused in mainline and we don't actually have any instances of it being necessary.

As such Rob Herring suggested we just drop it and I can't immediately see any reason to disagree.

If anyone has an out of tree dts file that makes use of this then let me know. I'm not against keeping the code, but documenting it as a deprecated property not to be used in new dts files.

Note build tested only. If someone could give it a sanity check on a platform that uses this interface that would be great. If not I'll mock something up before applying this.

Signed-off-by Jonathan Cameron <[email protected]>

Cc Guenter Roeck <[email protected]>

Cc Lars-Peter Clausen <[email protected]>

---
 drivers/iio/inkern.c | 49 +++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

drivers/iio/inkern.c +17 -32

index ede99e0d5371..85a6f6103ee9 100644
@@ -184,40 +184,25 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
 						      const char *name)
 {
 	struct iio_channel *chan = NULL;
-
-	/* Walk up the tree of devices looking for a matching iio channel */
-	while (np) {
-		int index = 0;
-
-		/*
-		 * For named iio channels, first look up the name in the
-		 * "io-channel-names" property.  If it cannot be found, the
-		 * index will be an error code, and of_iio_channel_get()
-		 * will fail.
-		 */
-		if (name)
-			index = of_property_match_string(np, "io-channel-names",
+	int index = 0;
+
+	/*
+	 * For named iio channels, first look up the name in the
+	 * "io-channel-names" property.  If it cannot be found, the
+	 * index will be an error code, and of_iio_channel_get()
+	 * will fail.
+	 */
+	if (name)
+		index = of_property_match_string(np, "io-channel-names",
 							 name);
-		chan = of_iio_channel_get(np, index);
-		if (!IS_ERR(chan) || PTR_ERR(chan) == -EPROBE_DEFER)
-			break;
-		else if (name && index >= 0) {
-			pr_err("ERROR: could not get IIO channel %pOF:%s(%i)\n",
-				np, name ? name : "", index);
-			return NULL;
-		}
+	chan = of_iio_channel_get(np, index);
+	if (!IS_ERR(chan) || PTR_ERR(chan) == -EPROBE_DEFER)
+		return chan;
+	else if (name && index >= 0)
+		pr_err("ERROR: could not get IIO channel %pOF:%s(%i)\n",
+		       np, name ? name : "", index);
 
-		/*
-		 * No matching IIO channel found on this node.
-		 * If the parent node has a "io-channel-ranges" property,
-		 * then we can try one of its channels.
-		 */
-		np = np->parent;
-		if (np && !of_get_property(np, "io-channel-ranges", NULL))
-			return NULL;
-	}
-
-	return chan;
+	return NULL;
 }
 
 static struct iio_channel *of_iio_channel_get_all(struct device *dev)