Support ROHM BD79124 ADC
Subsystems (14)
Matti Vaittinen
maintainerv8 cover Support ROHM BD79124 ADC
Support ROHM BD79124 ADC.
This series adds also couple of IIO ADC helper functions for parsing the channel information from the device tree. There are also new helpers included for iterating and counting firmware child nodes with a specific name.
Series does also convert couple of drivers to use these helpers. The rzg2l_adc and the sun20i-gpadc are converted to use the new ADC helper.
The gianfar driver under net and the thp7312 under media/i2c are added as first users of the newly added "named child node" -helpers.
There has been some discussion about how useful these ADC helpers are, and whether they should support also differential and single ended channel configurations. This version does not include support for those - with the benefit of reduced complexity and easier to use API.
NOTE: Patches 4,5,9 and 10 are untested as I lack of relevant HW. They have been compile tested only.
The ROHM BD79124 ADC itself is quite usual stuff. 12-bit, 8-channel ADC with threshold monitoring.
Except that:
- each ADC input pin can be configured as a general purpose output.
- manually starting an ADC conversion and reading the result would require the I2C _master_ to do clock stretching(!) for the duration of the conversion... Let's just say this is not well supported.
- IC supports 'autonomous measurement mode' and storing latest results to the result registers. This mode is used by the driver due to the "peculiar" I2C when doing manual reads.
Furthermore, the ADC uses this continuous autonomous measuring, and the IC keeps producing new 'out of window' IRQs if measurements are out of window - the driver disables the event for 1 seconds when sending it to user. This prevents generating storm of events
Revision history:
v7 => v8:
property helpers:
- Fix the example in fwnode_get_named_child_node_count() documentation to use the fwnode_get_named_child_node_count() and not the device_get_named_child_node_count()
- Fix the rest of the new macro's indentiations
adc helpers:
- Treat 0 ADC channels as an error in devm_iio_adc_device_alloc_chaninfo_se().
rzg2l_adc / sun20i-gpadc:
- Drop zero channels check from the ADC drivers using devm_iio_adc_device_alloc_chaninfo_se()
BD79124:
- Use unsigned for regmap values
- Commit message fine tuning
- Check devm_mutex_init() return value
- Handle 'ALL pins as ADC or GPO' cleanly in BD79124 driver
- BD79124 styling / typofixes
v6 => v7:
- Inline device_get_named_child_node_count()
- Fix kernel-doc for fwnode_get_named_child_node_count()
- Minor styling fixes
More accurate changelog in individual patches.
v5 => v6:
- Drop applied patch
- Add *_for_each_named_child_* iterators
- Add a patch converting the thp7312 driver to use the new helper
- Styling and minor things pointed by reviewers
v4 => v5: Fixes as per various review comments. Most notably:
- Drop the patch making the TI's ADC driver to respect device tree.
- Add (RFC) patch converting gianfar driver to use new name child-node counting API as suggested by Andy.
- Add fwnode_get_child_node_count_named() as suggested by Rob.
- rebase to v6.14-rc5
More accurate changelog in individual patches.
v3 => v4:
- Drop the ADC helper support for differential channels
- Drop the ADC helper for getting only channel IDs by fwnode.
- "Promote" the function counting the number of child nodes with a specific name to the property.h (As suggested by Jonathan).
- Add ADC helpers to a namespace.
- Rebase on v6.14-rc3
- More minor changes described in individual patches.
v2 => v3:
- Restrict BD79124 channel numbers as suggested by Conor and add Conor's Reviewed-by tag.
- Support differential and single-ended inputs
- Convert couple of existing drivers to use the added ADC helpers
- Minor fixes based on reviews
Link to v2:
https://lore.kernel.org/all/[email protected]/
RFC v1 => v2:
- Drop MFD and pinmux.
- Automatically re-enable events after 1 second.
- Export fwnode parsing helpers for finding the ADC channels.
---
Matti Vaittinen (10):
dt-bindings: ROHM BD79124 ADC/GPO
property: Add functions to iterate named child
iio: adc: add helpers for parsing ADC nodes
iio: adc: rzg2l_adc: Use adc-helpers
iio: adc: sun20i-gpadc: Use adc-helpers
iio: adc: Support ROHM BD79124 ADC
MAINTAINERS: Add IIO ADC helpers
MAINTAINERS: Add ROHM BD79124 ADC/GPO
net: gianfar: Use device_get_child_node_count_named()
media: thp7312: Use helper for iterating named child nodes
.../bindings/iio/adc/rohm,bd79124.yaml | 114 ++ MAINTAINERS | 12 + drivers/base/property.c | 27 + drivers/iio/adc/Kconfig | 17 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/industrialio-adc.c | 82 ++ drivers/iio/adc/rohm-bd79124.c | 1138 +++++++++++++++++ drivers/iio/adc/rzg2l_adc.c | 39 +- drivers/iio/adc/sun20i-gpadc-iio.c | 39 +- drivers/media/i2c/thp7312.c | 8 +- drivers/net/ethernet/freescale/gianfar.c | 17 +- include/linux/iio/adc-helpers.h | 27 + include/linux/property.h | 24 + 13 files changed, 1481 insertions(+), 66 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml create mode 100644 drivers/iio/adc/industrialio-adc.c create mode 100644 drivers/iio/adc/rohm-bd79124.c create mode 100644 include/linux/iio/adc-helpers.h
base-commit: 7eb172143d5508b4da468ed59ee857c6e5e01da6
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH v8 1/10 dt-bindings: ROHM BD79124 ADC/GPO
Add binding document for the ROHM BD79124 ADC / GPO.
ROHM BD79124 is a 8-channel, 12-bit ADC. The input pins can also be used as general purpose outputs.
---
Revision history:
v3 =>
- No changes
v2 => v3:
- Restrict channel numbers to 0-7 as suggested by Conor
RFC v1 => v2:
- drop MFD and represent directly as ADC
- drop pinmux and treat all non ADC channel pins as GPOs
--- .../bindings/iio/adc/rohm,bd79124.yaml | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml
Documentation/devicetree/bindings/iio/adc/rohm,bd79124.yaml new file +114 -0
@@ -0,0 +1,114 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/rohm,bd79124.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ROHM BD79124 ADC/GPO + +maintainers: + - Matti Vaittinen <[email protected]> + +description: | + The ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports + an automatic measurement mode, with an alarm interrupt for out-of-window + measurements. ADC input pins can be also configured as general purpose + outputs. + +properties: + compatible: + const: rohm,bd79124 + + reg: + description: + I2C slave address. + maxItems: 1 + + interrupts: + maxItems: 1 + + gpio-controller: true + + "#gpio-cells": + const: 1 + description: + The pin number. + + vdd-supply: true + + iovdd-supply: true + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +patternProperties: + "^channel@[0-7]+$": + type: object + $ref: /schemas/iio/adc/adc.yaml# + description: Represents ADC channel. + + properties: + reg: + description: AIN pin number + minimum: 0 + maximum: 7 + + required: + - reg + + additionalProperties: false + +required: + - compatible + - reg + - iovdd-supply + - vdd-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/leds/common.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + adc: adc@10 { + compatible = "rohm,bd79124"; + reg = <0x10>; + + interrupt-parent = <&gpio1>; + interrupts = <29 8>; + + vdd-supply = <&dummyreg>; + iovdd-supply = <&dummyreg>; + + #address-cells = <1>; + #size-cells = <0>; + + channel@0 { + reg = <0>; + }; + channel@1 { + reg = <1>; + }; + channel@2 { + reg = <2>; + }; + channel@3 { + reg = <3>; + }; + channel@4 { + reg = <4>; + }; + channel@5 { + reg = <5>; + }; + channel@6 { + reg = <6>; + }; + }; + };
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH v8 2/10 property: Add functions to iterate named child
In reply to Matti VaittinenThere are a few use-cases where child nodes with a specific name need to be parsed. Code like:
fwnode_for_each_child_node()
if (fwnode_name_eq()) ...
can be found from a various drivers/subsystems. Adding a macro for this can simplify things a bit.
In a few cases the data from the found nodes is later added to an array, which is allocated based on the number of found nodes. One example of such use is the IIO subsystem's ADC channel nodes, where the relevant nodes are named as channel[@N].
Add helpers for iterating and counting device's sub-nodes with certain name instead of open-coding this in every user.
---
Revision history:
v7 => v8:
- Fix the example in fwnode_get_named_child_node_count() documentation to use the fwnode_get_named_child_node_count() and not the device_get_named_child_node_count()
- Fix the rest of the new macro's indentiations
v6 => v7:
- Improve kerneldoc
- Inline device_get_named_child_node_count() and change it to call fwnode_get_named_child_node_count() inside
- Fix indentiation of the new macros
v5 => v6:
- Add helpers to also iterate through the nodes.
v4 => v5:
- Use given name instead of string 'channel' when counting the nodes
- Add also fwnode_get_child_node_count_named() as suggested by Rob.
v3 => v4:
- New patch as suggested by Jonathan, see discussion in:
https://lore.kernel.org/lkml/20250223161338.5c896280@jic23-huawei/
--- drivers/base/property.c | 27 +++++++++++++++++++++++++++ include/linux/property.h | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+)
drivers/base/property.c +27 -0
@@ -945,6 +945,33 @@ unsigned int device_get_child_node_count(const struct device *dev) }EXPORT_SYMBOL_GPL (device_get_child_node_count); +/** +* fwnode_get_named_child_node_count - number of child nodes with given name +* @fwnode: Node which child nodes are counted. +* @name: String to match child node name against. +* +* Scan child nodes and count all the nodes with a specific name. Potential +* 'number' -ending after the 'at sign' for scanned names is ignored. +* E.g.:: +* fwnode_get_named_child_node_count(fwnode, "channel"); +* would match all the nodes:: +* channel { }, channel@0 {}, channel@0xabba {}... +* +* Return: the number of child nodes with a matching name for a given device. +*/ +unsigned int fwnode_get_named_child_node_count (const struct fwnode_handle *fwnode, +const char *name) +{ +struct fwnode_handle *child; +unsigned int count =0 ; + +fwnode_for_each_named_child_node (fwnode, child, name) + count++; + +return count; +} +EXPORT_SYMBOL_GPL (fwnode_get_named_child_node_count); +bool device_dma_supported (const struct device *dev) {return fwnode_call_bool_op (dev_fwnode (dev), device_dma_supported);
include/linux/property.h +24 -0
@@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node(for (child =fwnode_get_next_child_node (fwnode,NULL ); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node (fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define fwnode_for_each_available_child_node (fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) +#define fwnode_for_each_available_named_child_node (fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +struct fwnode_handle *device_get_next_child_node (const struct device *dev,struct fwnode_handle *child);
@@ -178,11 +186,19 @@ struct fwnode_handle *device_get_next_child_node(const struct device *dev,for (child =device_get_next_child_node (dev,NULL ); child; \ child = device_get_next_child_node(dev, child)) +#define device_for_each_named_child_node (dev, child, name) \ + device_for_each_child_node(dev, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define device_for_each_child_node_scoped (dev, child) \ for (struct fwnode_handle *child __free(fwnode_handle) = \ device_get_next_child_node(dev, NULL); \ child; child = device_get_next_child_node(dev, child)) +#define device_for_each_named_child_node_scoped (dev, child, name) \ + device_for_each_child_node_scoped(dev, child) \ + if (!fwnode_name_eq(child, name)) { } else +struct fwnode_handle *fwnode_get_named_child_node (const struct fwnode_handle *fwnode,const char *childname); struct fwnode_handle *device_get_named_child_node(const struct device *dev,
@@ -210,6 +226,14 @@ int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name);unsigned int device_get_child_node_count (const struct device *dev); +unsigned int fwnode_get_named_child_node_count (const struct fwnode_handle *fwnode, +const char *name); +static inline unsigned int device_get_named_child_node_count (const struct device *dev, +const char *name) +{ +return fwnode_get_named_child_node_count (dev_fwnode (dev), name); +} +static inline int device_property_read_u8 (const struct device *dev,const char *propname,u8 *val) {
Signature · 1 line
2.48.1
Sakari Ailus
reviewerRe: [PATCH v8 02/10] property: Add functions to iterate named child
Moi,
Quoted 95 lines · Matti Vaittinen
There are a few use-cases where child nodes with a specific name need to be parsed. Code like:
fwnode_for_each_child_node()if (fwnode_name_eq()) ...can be found from a various
drivers/subsystems. Adding a macro for this can simplify things a bit.In a few cases the data from the found nodes is later added to an array, which is allocated based on the number of found nodes. One example of such use is the IIO subsystem's ADC channel nodes, where the relevant nodes are named as channel[@N].
Add helpers for iterating and counting device's sub-nodes with certain name instead of open-coding this in every user.
Suggested-by Jonathan Cameron <[email protected]>Signed-off-by Matti Vaittinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Reviewed-by Marcelo Schmitt <[email protected]>---
Revision history:
v7 => v8:
- Fix the example infwnode_get_named_child_node_count()documentation to use thefwnode_get_named_child_node_count()and not thedevice_get_named_child_node_count()
- Fix the rest of the new macro's indentiations
v6 => v7:
- Improve kerneldoc
- Inlinedevice_get_named_child_node_count()and change it to callfwnode_get_named_child_node_count()inside
- Fix indentiation of the new macros
v5 => v6:
- Add helpers to also iterate through the nodes.
v4 => v5:
- Use given name instead of string 'channel' when counting the nodes
- Add alsofwnode_get_child_node_count_named()as suggested by Rob.
v3 => v4:
- New patch as suggested by Jonathan, see discussion in:
https://lore.kernel.org/lkml/20250223161338.5c896280@jic23-huawei/--- drivers/base/property.c | 27 +++++++++++++++++++++++++++ include/linux/property.h | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+)drivers/base/property.c +27
-0@@ -945,6 +945,33 @@ unsigned int device_get_child_node_count(const struct device *dev) }EXPORT_SYMBOL_GPL (device_get_child_node_count); +/** +* fwnode_get_named_child_node_count - number of child nodes with given name +* @fwnode: Node which child nodes are counted. +* @name: String to match child node name against. +* +* Scan child nodes and count all the nodes with a specific name. Potential +* 'number' -ending after the 'at sign' for scanned names is ignored. +* E.g.:: +* fwnode_get_named_child_node_count(fwnode, "channel"); +* would match all the nodes:: +* channel { }, channel@0 {}, channel@0xabba {}... +* +* Return: the number of child nodes with a matching name for a given device. +*/ +unsigned int fwnode_get_named_child_node_count (const struct fwnode_handle *fwnode, +const char *name) +{ +struct fwnode_handle *child; +unsigned int count =0 ; + +fwnode_for_each_named_child_node (fwnode, child, name) + count++; + +return count; +} +EXPORT_SYMBOL_GPL (fwnode_get_named_child_node_count); +bool device_dma_supported (const struct device *dev) {return fwnode_call_bool_op (dev_fwnode (dev), device_dma_supported);include/linux/property.h +2
-0@@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node(for (child =fwnode_get_next_child_node (fwnode,NULL ); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node (fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \
include/linux/property.h struct fwnode_handle *fwnode_get_next_available_child_node( · line 181
Quoted 10 lines
include/linux/property.h +6
-0+ if (!fwnode_name_eq(child, name)) { } else +#define fwnode_for_each_available_child_node (fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) +#define fwnode_for_each_available_named_child_node (fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +
OF only enumerates available nodes via the fwnode API, software nodes don't have the concept but on ACPI I guess you could have a difference in nodes where you have device sub-nodes that aren't available. Still, these ACPI device nodes don't have meaningful names in this context (they're 4-character object names) so you wouldn't use them like this anyway.
So my question is: is it useful to provide this besides fwnode_for_each_named_child_node(), given that both are effectively the same?
Quoted 38 lines
include/linux/property.h +16
-0struct fwnode_handle *device_get_next_child_node (const struct device *dev,struct fwnode_handle *child);@@ -178,11 +186,19 @@ struct fwnode_handle *device_get_next_child_node(const struct device *dev,for (child =device_get_next_child_node (dev,NULL ); child; \ child = device_get_next_child_node(dev, child)) +#define device_for_each_named_child_node (dev, child, name) \ + device_for_each_child_node(dev, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define device_for_each_child_node_scoped (dev, child) \ for (struct fwnode_handle *child __free(fwnode_handle) = \ device_get_next_child_node(dev, NULL); \ child; child = device_get_next_child_node(dev, child)) +#define device_for_each_named_child_node_scoped (dev, child, name) \ + device_for_each_child_node_scoped(dev, child) \ + if (!fwnode_name_eq(child, name)) { } else +struct fwnode_handle *fwnode_get_named_child_node (const struct fwnode_handle *fwnode,const char *childname); struct fwnode_handle *device_get_named_child_node(const struct device *dev,@@ -210,6 +226,14 @@ int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name);unsigned int device_get_child_node_count (const struct device *dev); +unsigned int fwnode_get_named_child_node_count (const struct fwnode_handle *fwnode, +const char *name); +static inline unsigned int device_get_named_child_node_count (const struct device *dev, +const char *name) +{ +return fwnode_get_named_child_node_count (dev_fwnode (dev), name); +} +static inline int device_property_read_u8 (const struct device *dev,const char *propname,u8 *val) {
Signature · 3 lines
Terveisin, Sakari Ailus
Matti Vaittinen
maintainerRe: [PATCH v8 02/10] property: Add functions to iterate named child
Moro Sakari,
Thanks for the review.
Quoted 104 lines · Sakari Ailus
Moi,
Quoted 101 lines · Matti Vaittinen
There are a few use-cases where child nodes with a specific name need to be parsed. Code like:
fwnode_for_each_child_node()if (fwnode_name_eq()) ...can be found from a various
drivers/subsystems. Adding a macro for this can simplify things a bit.In a few cases the data from the found nodes is later added to an array, which is allocated based on the number of found nodes. One example of such use is the IIO subsystem's ADC channel nodes, where the relevant nodes are named as channel[@N].
Add helpers for iterating and counting device's sub-nodes with certain name instead of open-coding this in every user.
Suggested-by Jonathan Cameron <[email protected]>Signed-off-by Matti Vaittinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Reviewed-by Marcelo Schmitt <[email protected]>---
Revision history:
v7 => v8:
- Fix the example infwnode_get_named_child_node_count()documentation to use thefwnode_get_named_child_node_count()and not thedevice_get_named_child_node_count()
- Fix the rest of the new macro's indentiations
v6 => v7:
- Improve kerneldoc
- Inlinedevice_get_named_child_node_count()and change it to callfwnode_get_named_child_node_count()inside
- Fix indentiation of the new macros
v5 => v6:
- Add helpers to also iterate through the nodes.
v4 => v5:
- Use given name instead of string 'channel' when counting the nodes
- Add alsofwnode_get_child_node_count_named()as suggested by Rob.
v3 => v4:
- New patch as suggested by Jonathan, see discussion in:
https://lore.kernel.org/lkml/20250223161338.5c896280@jic23-huawei/--- drivers/base/property.c | 27 +++++++++++++++++++++++++++ include/linux/property.h | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+)drivers/base/property.c +27
-0@@ -945,6 +945,33 @@ unsigned int device_get_child_node_count(const struct device *dev) }EXPORT_SYMBOL_GPL (device_get_child_node_count); +/** +* fwnode_get_named_child_node_count - number of child nodes with given name +* @fwnode: Node which child nodes are counted. +* @name: String to match child node name against. +* +* Scan child nodes and count all the nodes with a specific name. Potential +* 'number' -ending after the 'at sign' for scanned names is ignored. +* E.g.:: +* fwnode_get_named_child_node_count(fwnode, "channel"); +* would match all the nodes:: +* channel { }, channel@0 {}, channel@0xabba {}... +* +* Return: the number of child nodes with a matching name for a given device. +*/ +unsigned int fwnode_get_named_child_node_count (const struct fwnode_handle *fwnode, +const char *name) +{ +struct fwnode_handle *child; +unsigned int count =0 ; + +fwnode_for_each_named_child_node (fwnode, child, name) + count++; + +return count; +} +EXPORT_SYMBOL_GPL (fwnode_get_named_child_node_count); +bool device_dma_supported (const struct device *dev) {return fwnode_call_bool_op (dev_fwnode (dev), device_dma_supported);include/linux/property.h +4
-0@@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node(for (child =fwnode_get_next_child_node (fwnode,NULL ); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node (fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define fwnode_for_each_available_child_node (fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child))
Quoted 10 lines
include/linux/property.h struct fwnode_handle *fwnode_get_next_available_child_node( · line 181
Quoted 4 lines
include/linux/property.h +4
-0+#define fwnode_for_each_available_named_child_node (fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +OF only enumerates available nodes via the fwnode API, software nodes don't have the concept but on ACPI I guess you could have a difference in nodes where you have device sub-nodes that aren't available. Still, these ACPI device nodes don't have meaningful names in this context (they're 4-character object names) so you wouldn't use them like this anyway.
I believe you have far better understanding on these concepts than I do. The reason behind adding fwnode_for_each_available_child_node() was the patch 10/10:
- fwnode_for_each_available_child_node(sensors, node) {
- if (fwnode_name_eq(node, "sensor")) {
- if (!thp7312_sensor_parse_dt(thp7312, node))
- num_sensors++;
- }
+ fwnode_for_each_available_named_child_node(sensors, node, "sensor") {
+ if (!thp7312_sensor_parse_dt(thp7312, node))
+ num_sensors++;
}
Quoted 3 lines
So my question is: is it useful to provide this besides
fwnode_for_each_named_child_node(), given that both are effectively the same?
So, I suppose you're saying the existing thp7312 -driver has no real reason to use the 'fwnode_for_each_available_child_node()', but it could be using fwnode_for_each_child_node() instead?
If so, I am Ok with dropping the 'fwnode_for_each_available_named_child_node()' and changing the 10/10 to:
- fwnode_for_each_available_child_node(sensors, node) {
- if (fwnode_name_eq(node, "sensor")) {
- if (!thp7312_sensor_parse_dt(thp7312, node))
- num_sensors++;
- }
+ fwnode_for_each_named_child_node(sensors, node, "sensor") {
+ if (!thp7312_sensor_parse_dt(thp7312, node))
+ num_sensors++;
}
Do you think that'd be correct?
Yours,
-- Matti
Sakari Ailus
reviewerRe: [PATCH v8 02/10] property: Add functions to iterate named child
Hei Matti,
Quoted 153 lines · Matti Vaittinen
Moro Sakari,
Thanks for the review.
Quoted 103 lines · Sakari Ailus
Moi,
Quoted 100 lines · Matti Vaittinen
There are a few use-cases where child nodes with a specific name need to be parsed. Code like:
fwnode_for_each_child_node()if (fwnode_name_eq()) ...can be found from a various
drivers/subsystems. Adding a macro for this can simplify things a bit.In a few cases the data from the found nodes is later added to an array, which is allocated based on the number of found nodes. One example of such use is the IIO subsystem's ADC channel nodes, where the relevant nodes are named as channel[@N].
Add helpers for iterating and counting device's sub-nodes with certain name instead of open-coding this in every user.
Suggested-by Jonathan Cameron <[email protected]>Signed-off-by Matti Vaittinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Reviewed-by Marcelo Schmitt <[email protected]>---
Revision history:
v7 => v8:
- Fix the example infwnode_get_named_child_node_count()documentation to use thefwnode_get_named_child_node_count()and not thedevice_get_named_child_node_count()
- Fix the rest of the new macro's indentiations
v6 => v7:
- Improve kerneldoc
- Inlinedevice_get_named_child_node_count()and change it to callfwnode_get_named_child_node_count()inside
- Fix indentiation of the new macros
v5 => v6:
- Add helpers to also iterate through the nodes.
v4 => v5:
- Use given name instead of string 'channel' when counting the nodes
- Add alsofwnode_get_child_node_count_named()as suggested by Rob.
v3 => v4:
- New patch as suggested by Jonathan, see discussion in:
https://lore.kernel.org/lkml/20250223161338.5c896280@jic23-huawei/--- drivers/base/property.c | 27 +++++++++++++++++++++++++++ include/linux/property.h | 24 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+)drivers/base/property.c +27
-0@@ -945,6 +945,33 @@ unsigned int device_get_child_node_count(const struct device *dev) }EXPORT_SYMBOL_GPL (device_get_child_node_count); +/** +* fwnode_get_named_child_node_count - number of child nodes with given name +* @fwnode: Node which child nodes are counted. +* @name: String to match child node name against. +* +* Scan child nodes and count all the nodes with a specific name. Potential +* 'number' -ending after the 'at sign' for scanned names is ignored. +* E.g.:: +* fwnode_get_named_child_node_count(fwnode, "channel"); +* would match all the nodes:: +* channel { }, channel@0 {}, channel@0xabba {}... +* +* Return: the number of child nodes with a matching name for a given device. +*/ +unsigned int fwnode_get_named_child_node_count (const struct fwnode_handle *fwnode, +const char *name) +{ +struct fwnode_handle *child; +unsigned int count =0 ; + +fwnode_for_each_named_child_node (fwnode, child, name) + count++; + +return count; +} +EXPORT_SYMBOL_GPL (fwnode_get_named_child_node_count); +bool device_dma_supported (const struct device *dev) {return fwnode_call_bool_op (dev_fwnode (dev), device_dma_supported);include/linux/property.h +6
-0@@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node(for (child =fwnode_get_next_child_node (fwnode,NULL ); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node (fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define fwnode_for_each_available_child_node (fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) +#define fwnode_for_each_available_named_child_node (fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \Quoted 8 lines
include/linux/property.h struct fwnode_handle *fwnode_get_next_available_child_node( · line 179
Quoted 2 lines
include/linux/property.h +2
-0+if (!fwnode_name_eq (child, name)) { }else +OF only enumerates available nodes via the fwnode API, software nodes don't have the concept but on ACPI I guess you could have a difference in nodes where you have device sub-nodes that aren't available. Still, these ACPI device nodes don't have meaningful names in this context (they're 4-character object names) so you wouldn't use them like this anyway.
I believe you have far better understanding on these concepts than I do. The reason behind adding
fwnode_for_each_available_child_node()was the patch 10/10:(quoted diff) +3
-5- fwnode_for_each_available_child_node(sensors, node) { - if (fwnode_name_eq(node, "sensor")) { - if (!thp7312_sensor_parse_dt(thp7312, node)) - num_sensors++; - } + fwnode_for_each_available_named_child_node(sensors, node, "sensor") { + if (!thp7312_sensor_parse_dt(thp7312, node)) + num_sensors++; }Quoted 5 lines
So my question is: is it useful to provide this besides
fwnode_for_each_named_child_node(), given that both are effectively the same?So, I suppose you're saying the existing thp7312 -driver has no real reason to use the '
fwnode_for_each_available_child_node()', but it could be usingfwnode_for_each_child_node()instead?If so, I am Ok with dropping the '
fwnode_for_each_available_named_child_node()' and changing the 10/10 to:(quoted diff) +3
-5- fwnode_for_each_available_child_node(sensors, node) { - if (fwnode_name_eq(node, "sensor")) { - if (!thp7312_sensor_parse_dt(thp7312, node)) - num_sensors++; - } + fwnode_for_each_named_child_node(sensors, node, "sensor") { + if (!thp7312_sensor_parse_dt(thp7312, node)) + num_sensors++; }
Quoted 1 line
Do you think that'd be correct?
I'd say so. Feel free to cc me to the last patch as well.
I guess one way to make this clearer is to switch to fwnode_for_each_child_node() in a separate patch before fwnode_for_each_named_child_node() conversion.
There are also just a handful of users of fwnode_for_each_available_child_node() and I guess these could be converted, too, but I think it's outside the scope of the set.
Signature · 3 lines
Terveisin, Sakari Ailus
Matti Vaittinen
maintainerRe: [PATCH v8 02/10] property: Add functions to iterate named child
Quoted 5 lines · Sakari Ailus
Quoted 4 lines · Matti Vaittinen
Quoted 3 lines · Sakari Ailus
Quoted 2 lines · Matti Vaittinen
There are a few use-cases where child nodes with a specific name need to be parsed. Code like:
...
Quoted 59 lines
Quoted 59 lines
Quoted 14 lines
Quoted 14 lines
include/linux/property.h +6
-0@@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node(for (child =fwnode_get_next_child_node (fwnode,NULL ); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node (fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define fwnode_for_each_available_child_node (fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) +#define fwnode_for_each_available_named_child_node (fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \Quoted 8 lines
include/linux/property.h struct fwnode_handle *fwnode_get_next_available_child_node( · line 179
Quoted 2 lines
include/linux/property.h +2
-0+if (!fwnode_name_eq (child, name)) { }else +OF only enumerates available nodes via the fwnode API, software nodes don't have the concept but on ACPI I guess you could have a difference in nodes where you have device sub-nodes that aren't available. Still, these ACPI device nodes don't have meaningful names in this context (they're 4-character object names) so you wouldn't use them like this anyway.
I believe you have far better understanding on these concepts than I do. The reason behind adding
fwnode_for_each_available_child_node()was the patch 10/10:(quoted diff) +3
-5- fwnode_for_each_available_child_node(sensors, node) { - if (fwnode_name_eq(node, "sensor")) { - if (!thp7312_sensor_parse_dt(thp7312, node)) - num_sensors++; - } + fwnode_for_each_available_named_child_node(sensors, node, "sensor") { + if (!thp7312_sensor_parse_dt(thp7312, node)) + num_sensors++; }Quoted 5 lines
So my question is: is it useful to provide this besides
fwnode_for_each_named_child_node(), given that both are effectively the same?So, I suppose you're saying the existing thp7312 -driver has no real reason to use the '
fwnode_for_each_available_child_node()', but it could be usingfwnode_for_each_child_node()instead?If so, I am Ok with dropping the '
fwnode_for_each_available_named_child_node()' and changing the 10/10 to:(quoted diff) +3
-5- fwnode_for_each_available_child_node(sensors, node) { - if (fwnode_name_eq(node, "sensor")) { - if (!thp7312_sensor_parse_dt(thp7312, node)) - num_sensors++; - } + fwnode_for_each_named_child_node(sensors, node, "sensor") { + if (!thp7312_sensor_parse_dt(thp7312, node)) + num_sensors++; }
Quoted 3 lines
Quoted 1 line
Do you think that'd be correct?
I'd say so. Feel free to cc me to the last patch as well.
Thanks. I'll drop the fwnode_for_each_available_named_child_node() then.
Quoted 3 lines
I guess one way to make this clearer is to switch to
fwnode_for_each_child_node()in a separate patch beforefwnode_for_each_named_child_node()conversion.
I suppose this makes sense.
I think this series can't make it to 6.15-rc1. Meaning, these *_named_*() APIs perhaps land in 6.16-rc1. I assume these *_named_*() APIs will go through the IIO. This rather simple IIO driver's review took longer than I predicted, with more versions I intended (as always) - and I kind of dislike respinning the whole series, with this large audience, when changes are not interesting to the most.
Maybe it is simplest to drop the thp7312 (and gianfar) from this series, and respin them only when the 6.16-rc1 is out. It's going to be couple of months though - so there's always a risk that I forget.
The proposed change for the thp7312, from fwnode_for_each_available_child_node() to fwnode_for_each_child_node() can be done earlier though.
Quoted 3 lines
There are also just a handful of users of
fwnode_for_each_available_child_node()and I guess these could be converted, too, but I think it's outside the scope of the set.
Definitely not in the scope of the bd79124 support :)
Yours,
-- Matti
Jonathan Cameron
maintainerRe: [PATCH v8 02/10] property: Add functions to iterate named child
Quoted 72 lines · On Thu, 20 Mar 2025 08:43:44 +0200 Matti Vaittinen <[email protected]>…
Quoted 5 lines · Sakari Ailus
Quoted 4 lines · Matti Vaittinen
Quoted 3 lines · Sakari Ailus
Quoted 2 lines · Matti Vaittinen
There are a few use-cases where child nodes with a specific name need to be parsed. Code like:
...
Quoted 59 lines
Quoted 59 lines
Quoted 14 lines
Quoted 14 lines
include/linux/property.h +6
-0@@ -167,10 +167,18 @@ struct fwnode_handle *fwnode_get_next_available_child_node(for (child =fwnode_get_next_child_node (fwnode,NULL ); child; \ child = fwnode_get_next_child_node(fwnode, child)) +#define fwnode_for_each_named_child_node (fwnode, child, name) \ + fwnode_for_each_child_node(fwnode, child) \ + if (!fwnode_name_eq(child, name)) { } else +#define fwnode_for_each_available_child_node (fwnode, child) \ for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\ child = fwnode_get_next_available_child_node(fwnode, child)) +#define fwnode_for_each_available_named_child_node (fwnode, child, name) \ + fwnode_for_each_available_child_node(fwnode, child) \Quoted 8 lines
include/linux/property.h struct fwnode_handle *fwnode_get_next_available_child_node( · line 179
Quoted 2 lines
include/linux/property.h +2
-0+if (!fwnode_name_eq (child, name)) { }else +OF only enumerates available nodes via the fwnode API, software nodes don't have the concept but on ACPI I guess you could have a difference in nodes where you have device sub-nodes that aren't available. Still, these ACPI device nodes don't have meaningful names in this context (they're 4-character object names) so you wouldn't use them like this anyway.
I believe you have far better understanding on these concepts than I do. The reason behind adding
fwnode_for_each_available_child_node()was the patch 10/10:(quoted diff) +3
-5- fwnode_for_each_available_child_node(sensors, node) { - if (fwnode_name_eq(node, "sensor")) { - if (!thp7312_sensor_parse_dt(thp7312, node)) - num_sensors++; - } + fwnode_for_each_available_named_child_node(sensors, node, "sensor") { + if (!thp7312_sensor_parse_dt(thp7312, node)) + num_sensors++; }Quoted 5 lines
So my question is: is it useful to provide this besides
fwnode_for_each_named_child_node(), given that both are effectively the same?So, I suppose you're saying the existing thp7312 -driver has no real reason to use the '
fwnode_for_each_available_child_node()', but it could be usingfwnode_for_each_child_node()instead?If so, I am Ok with dropping the '
fwnode_for_each_available_named_child_node()' and changing the 10/10 to:(quoted diff) +3
-5- fwnode_for_each_available_child_node(sensors, node) { - if (fwnode_name_eq(node, "sensor")) { - if (!thp7312_sensor_parse_dt(thp7312, node)) - num_sensors++; - } + fwnode_for_each_named_child_node(sensors, node, "sensor") { + if (!thp7312_sensor_parse_dt(thp7312, node)) + num_sensors++; }Quoted 3 lines
Quoted 1 line
Do you think that'd be correct?
I'd say so. Feel free to cc me to the last patch as well.
Quoted 7 lines
Thanks. I'll drop the
fwnode_for_each_available_named_child_node()then.Quoted 3 lines
I guess one way to make this clearer is to switch to
fwnode_for_each_child_node()in a separate patch beforefwnode_for_each_named_child_node()conversion.I suppose this makes sense.
this _available_ thing is ancient history that has tripped us up many times before. I've very keen to not see another case sneaking in. Whether we can definitely 'fix' all existing cases is a different question..
Quoted 16 lines
I think this series can't make it to 6.15-rc1. Meaning, these *_named_*() APIs perhaps land in 6.16-rc1. I assume these *_named_*() APIs will go through the IIO. This rather simple IIO driver's review took longer than I predicted, with more versions I intended (as always)
- and I kind of dislike respinning the whole series, with this large audience, when changes are not interesting to the most.Maybe it is simplest to drop the thp7312 (and gianfar) from this series, and respin them only when the 6.16-rc1 is out. It's going to be couple of months though - so there's always a risk that I forget.
The proposed change for the thp7312, from
fwnode_for_each_available_child_node()tofwnode_for_each_child_node()can be done earlier though.
Quoted 5 lines
Quoted 3 lines
There are also just a handful of users of
fwnode_for_each_available_child_node()and I guess these could be converted, too, but I think it's outside the scope of the set.Definitely not in the scope of the bd79124 support :)
Agreed. Break this series up however you like and entirely up to you whether you do further cleanup of other bits of the kernel!
Jonathan
Quoted 3 lines
Yours,
-- Matti
Matti Vaittinen
maintainerPATCH v8 3/10 iio: adc: add helpers for parsing ADC nodes
In reply to Matti VaittinenThere are ADC ICs which may have some of the AIN pins usable for other functions. These ICs may have some of the AIN pins wired so that they should not be used for ADC.
(Preferred?) way for marking pins which can be used as ADC inputs is to add corresponding channels@N nodes in the device tree as described in the ADC binding yaml.
Add couple of helper functions which can be used to retrieve the channel information from the device node.
---
Revision history:
v7 => v8:
devm_iio_adc_device_alloc_chaninfo_se():
- Treat all negative values for the max ID as 'don't care'
- Return -ENOENT instead of '0' if no channels were found.
v5 => v6:
- Adapt to changed fwnode helper names
- Fix spelling
v4 => v5:
- Inline iio_adc_device_num_channels()
- Fix Indenting function parameters
- Combine the max channel ID checks.
v3 => v4:
- Drop diff-channel support
- Drop iio_adc_device_channels_by_property()
- Add IIO_DEVICE namespace
- Move industrialio-adc.o to top of the Makefile
- Some styling as suggested by Andy
- Re-consider included headers
v2 => v3: Mostly based on review comments by Jonathan
- Support differential and single-ended channels
- Rename iio_adc_device_get_channels() as iio_adc_device_channels_by_property()
- Improve spelling
- Drop support for cases where DT comes from parent device's node
- Decrease loop indent by reverting node name check conditions
- Don't set 'chan->indexed' by number of channels to keep the interface consistent no matter how many channels are connected.
- Fix ID range check and related comment
RFC v1 => v2:
- New patch
--- drivers/iio/adc/Kconfig | 3 ++ drivers/iio/adc/Makefile | 2 + drivers/iio/adc/industrialio-adc.c | 82 ++++++++++++++++++++++++++++++ include/linux/iio/adc-helpers.h | 27 ++++++++++ 4 files changed, 114 insertions(+) create mode 100644 drivers/iio/adc/industrialio-adc.c create mode 100644 include/linux/iio/adc-helpers.h
drivers/iio/adc/Kconfig +3 -0
@@ -6,6 +6,9 @@ menu "Analog to digital converters" +config IIO_ADC_HELPER + tristate + config AB8500_GPADC bool "ST-Ericsson AB8500 GPADC driver" depends on AB8500_CORE && REGULATOR_AB8500
drivers/iio/adc/Makefile +2 -0
@@ -3,6 +3,8 @@ # Makefile for IIO ADC drivers # +obj-$(CONFIG_IIO_ADC_HELPER) += industrialio-adc.o + # When adding new entries keep the list in alphabetical order obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
drivers/iio/adc/industrialio-adc.c new file +82 -0
82 lines not on this page · raw message
include/linux/iio/adc-helpers.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* +* The industrial I/O ADC firmware property parsing helpers +* +* Copyright (c) 2025 Matti Vaittinen <[email protected]> +*/ + +#ifndef _INDUSTRIAL_IO_ADC_HELPERS_H_ +#define _INDUSTRIAL_IO_ADC_HELPERS_H_ + +#include <linux/property.h> + +struct device ; +struct iio_chan_spec ; + +static inline int iio_adc_device_num_channels (struct device *dev) +{ +return device_get_named_child_node_count (dev,"channel" ); +} + +int devm_iio_adc_device_alloc_chaninfo_se (struct device *dev, +const struct iio_chan_spec *template, +int max_chan_id, +struct iio_chan_spec **cs); + +#endif /* _INDUSTRIAL_IO_ADC_HELPERS_H_ */
Signature · 1 line
2.48.1
Re: [PATCH v8 03/10] iio: adc: add helpers for parsing ADC nodes
Quoted 10 lines · Matti Vaittinen
There are ADC ICs which may have some of the AIN pins usable for other functions. These ICs may have some of the AIN pins wired so that they should not be used for ADC.
(Preferred?) way for marking pins which can be used as ADC inputs is to add corresponding channels@N nodes in the device tree as described in the ADC binding yaml.
Add couple of helper functions which can be used to retrieve the channel information from the device node.
LGTM now, thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Matti Vaittinen
maintainerPATCH v8 4/10 iio: adc: rzg2l_adc: Use adc-helpers
In reply to Matti VaittinenThe new devm_iio_adc_device_alloc_chaninfo_se() -helper is intended to help drivers avoid open-coding the for_each_node -loop for getting the channel IDs. The helper provides standard way to detect the ADC channel nodes (by the node name), and a standard way to convert the "reg" -properties to channel identification numbers, used in the struct iio_chan_spec. Furthermore, the helper can optionally check the found channel IDs are smaller than given maximum. This is useful for callers which later use the IDs for example for indexing a channel data array.
The original driver treated all found child nodes as channel nodes. The new helper requires channel nodes to be named channel[@N]. This should help avoid problems with devices which may contain also other but ADC child nodes. Quick grep from arch/* with the rzg2l_adc's compatible string didn't reveal any in-tree .dts with channel nodes named otherwise. Also, same grep shows all the .dts seem to have channel IDs between 0..num of channels.
Use the new helper.
---
NOTE: This change now drops a print "no channel children" which used to be printed if no channel nodes were found. It also changes the return value from -ENODEV to -ENOENT.
Revision history:
v7 => v8:
- drop explicit "no channels check". It is now done inside the devm_iio_adc_device_alloc_chaninfo_se().
v6 => v7:
- Fix function name in the commit message
v5 => v6:
- Commit message typofix
v4 => v5:
- Drop the diff-channel stuff from the commit message
v3 => v4:
- Adapt to 'drop diff-channel support' changes to ADC-helpers
- select ADC helpers in the Kconfig
- Rebased to 6.14-rc3 => channel type can no longer come from the template.
v2 => v3:
- New patch
The change is compile tested only!! Testing before applying is highly appreciated (as always!).
--- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/rzg2l_adc.c | 39 +++++++++++++++---------------------- 2 files changed, 17 insertions(+), 23 deletions(-)
drivers/iio/adc/Kconfig +1 -0
@@ -1222,6 +1222,7 @@ config RICHTEK_RTQ6056 config RZG2L_ADC tristate "Renesas RZ/G2L ADC driver" depends on ARCH_RZG2L || COMPILE_TEST + select IIO_ADC_HELPER help Say yes here to build support for the ADC found in Renesas RZ/G2L family.
drivers/iio/adc/rzg2l_adc.c +16 -23
@@ -11,6 +11,7 @@#include <linux/cleanup.h> #include <linux/completion.h> #include <linux/delay.h> +#include <linux/iio/adc-helpers.h> #include <linux/iio/iio.h> #include <linux/interrupt.h> #include <linux/io.h>
@@ -324,48 +325,39 @@ static irqreturn_t rzg2l_adc_isr(int irq, void *dev_id)return IRQ_HANDLED ; } +static const struct iio_chan_spec rzg2l_adc_chan_template = { + .indexed =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), +}; +static int rzg2l_adc_parse_properties (struct platform_device *pdev,struct rzg2l_adc *adc) {const struct rzg2l_adc_hw_params *hw_params = adc->hw_params;struct iio_chan_spec *chan_array;struct rzg2l_adc_data *data; -unsigned int channel;int num_channels; -int ret;u8 i; data =devm_kzalloc (&pdev->dev,sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ; - num_channels =device_get_child_node_count (&pdev->dev); -if (!num_channels) -return dev_err_probe (&pdev->dev, -ENODEV ,"no channel children\n" ); + num_channels =devm_iio_adc_device_alloc_chaninfo_se (&pdev->dev, + &rzg2l_adc_chan_template, + hw_params->num_channels -1 , + &chan_array); +if (num_channels <0 ) +return num_channels;if (num_channels > hw_params->num_channels)return dev_err_probe (&pdev->dev, -EINVAL ,"num of channel children out of range\n" ); - chan_array =devm_kcalloc (&pdev->dev, num_channels,sizeof (*chan_array), -GFP_KERNEL ); -if (!chan_array) -return -ENOMEM ; +for (i =0 ; i < num_channels; i++) { +int channel = chan_array[i].channel; - i =0 ; -device_for_each_child_node_scoped (&pdev->dev, fwnode) { - ret =fwnode_property_read_u32 (fwnode,"reg" , &channel); -if (ret) -return ret; - -if (channel >= hw_params->num_channels) -return -EINVAL ; - - chan_array[i].type = rzg2l_adc_channels[channel].type; - chan_array[i].indexed =1 ; - chan_array[i].channel = channel; - chan_array[i].info_mask_separate =BIT (IIO_CHAN_INFO_RAW ); chan_array[i].datasheet_name = rzg2l_adc_channels[channel].name; - i++; + chan_array[i].type = rzg2l_adc_channels[channel].type; } data->num_channels = num_channels;
@@ -626,3 +618,4 @@ module_platform_driver(rzg2l_adc_driver);MODULE_AUTHOR ("Lad Prabhakar <[email protected]>" );MODULE_DESCRIPTION ("Renesas RZ/G2L ADC driver" );MODULE_LICENSE ("GPL v2" ); +MODULE_IMPORT_NS ("IIO_DRIVER" );
Signature · 1 line
2.48.1
Re: [PATCH v8 04/10] iio: adc: rzg2l_adc: Use adc-helpers
Quoted 17 lines · Matti Vaittinen
The new
devm_iio_adc_device_alloc_chaninfo_se()-helper is intended to help drivers avoid open-coding thefor_each_node-loop for getting the channel IDs. The helper provides standard way to detect the ADC channel nodes (by the node name), and a standard way to convert the "reg" -properties to channel identification numbers, used in the structiio_chan_spec. Furthermore, the helper can optionally check the found channel IDs are smaller than given maximum. This is useful for callers which later use the IDs for example for indexing a channel data array.The original driver treated all found child nodes as channel nodes. The new helper requires channel nodes to be named channel[@N]. This should help avoid problems with devices which may contain also other but ADC child nodes. Quick grep from
arch/*with the rzg2l_adc's compatible string didn't reveal any in-tree .dts with channel nodes named otherwise. Also, same grep shows all the .dts seem to have channel IDs between 0..num of channels.
Quoted 1 line
Use the new helper.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Matti Vaittinen
maintainerPATCH v8 5/10 iio: adc: sun20i-gpadc: Use adc-helpers
In reply to Matti VaittinenThe new devm_iio_adc_device_alloc_chaninfo_se() -helper is intended to help drivers avoid open-coding the for_each_node -loop for getting the channel IDs. The helper provides standard way to detect the ADC channel nodes (by the node name), and a standard way to convert the "reg" -properties to channel identification numbers, used in the struct iio_chan_spec. Furthermore, the helper can optionally check the found channel IDs are smaller than given maximum. This is useful for callers which later use the IDs for example for indexing a channel data array.
The original driver treated all found child nodes as channel nodes. The new helper requires channel nodes to be named channel[@N]. This should help avoid problems with devices which may contain also other but ADC child nodes. Quick grep from arch/* with the sun20i-gpadc's compatible string didn't reveal any in-tree .dts with channel nodes named otherwise. Also, same grep shows all the in-tree .dts seem to have channel IDs between 0..num of channels.
Use the new helper.
---
NOTE: This change now drops a print "no channel children" which used to be printed if no channel nodes were found. It also changes the return value from -ENODEV to -ENOENT.
Revision history:
v7 => v8:
- drop explicit "no channels check". It is now done inside the devm_iio_adc_device_alloc_chaninfo_se().
v6 => v7:
- Fix function name in the commit message
v5 => v6:
- Commit message typofix
v4 => v5:
- Drop the diff-channel stuff from the commit message
v3 => v4:
- Adapt to 'drop diff-channel support' changes to ADC-helpers
- select ADC helpers in the Kconfig
v2 => v3:
- New patch
I picked the sun20i-gpadc in this series because it has a straightforward approach for populating the struct iio_chan_spec. Everything else except the .channel can use 'template'-data.
This makes the sun20i-gpadc well suited to be an example user of this new helper. I hope this patch helps to evaluate whether these helpers are worth the hassle.
The change is compile tested only!! Testing before applying is highly appreciated (as always!). Also, even though I tried to audit the dts files for the reg-properties in the channel nodes, use of references didn't make it easy. I can't guarantee I didn't miss anything.
--- drivers/iio/adc/Kconfig | 1 + drivers/iio/adc/sun20i-gpadc-iio.c | 39 +++++++++++------------------- 2 files changed, 15 insertions(+), 25 deletions(-)
drivers/iio/adc/Kconfig +1 -0
@@ -1357,6 +1357,7 @@ config SUN4I_GPADC config SUN20I_GPADC tristate "Allwinner D1/T113s/T507/R329 and similar GPADCs driver" depends on ARCH_SUNXI || COMPILE_TEST + select IIO_ADC_HELPER help Say yes here to build support for Allwinner (D1, T113, T507 and R329) SoCs GPADC. This ADC provides up to 16 channels.
drivers/iio/adc/sun20i-gpadc-iio.c +14 -25
@@ -15,6 +15,7 @@#include <linux/property.h> #include <linux/reset.h> +#include <linux/iio/adc-helpers.h> #include <linux/iio/iio.h> #define SUN20I_GPADC_DRIVER_NAME "sun20i-gpadc"
@@ -149,36 +150,23 @@ static void sun20i_gpadc_reset_assert(void *data)reset_control_assert (rst); } +static const struct iio_chan_spec sun20i_gpadc_chan_template = { + .type =IIO_VOLTAGE , + .indexed =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ), +}; +static int sun20i_gpadc_alloc_channels (struct iio_dev *indio_dev,struct device *dev) { -unsigned int channel; -int num_channels, i, ret; +int num_channels;struct iio_chan_spec *channels; - num_channels =device_get_child_node_count (dev); -if (num_channels ==0 ) -return dev_err_probe (dev, -ENODEV ,"no channel children\n" ); - - channels =devm_kcalloc (dev, num_channels,sizeof (*channels), -GFP_KERNEL ); -if (!channels) -return -ENOMEM ; - - i =0 ; -device_for_each_child_node_scoped (dev, node) { - ret =fwnode_property_read_u32 (node,"reg" , &channel); -if (ret) -return dev_err_probe (dev, ret,"invalid channel number\n" ); - - channels[i].type =IIO_VOLTAGE ; - channels[i].indexed =1 ; - channels[i].channel = channel; - channels[i].info_mask_separate =BIT (IIO_CHAN_INFO_RAW ); - channels[i].info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ); - - i++; - } + num_channels =devm_iio_adc_device_alloc_chaninfo_se (dev, + &sun20i_gpadc_chan_template,-1 , &channels); +if (num_channels <0 ) +return num_channels; indio_dev->channels = channels; indio_dev->num_channels = num_channels;
@@ -271,3 +259,4 @@ module_platform_driver(sun20i_gpadc_driver);MODULE_DESCRIPTION ("ADC driver for sunxi platforms" );MODULE_AUTHOR ("Maksim Kiselev <[email protected]>" );MODULE_LICENSE ("GPL" ); +MODULE_IMPORT_NS ("IIO_DRIVER" );
Signature · 1 line
2.48.1
Re: [PATCH v8 05/10] iio: adc: sun20i-gpadc: Use adc-helpers
Quoted 17 lines · Matti Vaittinen
The new
devm_iio_adc_device_alloc_chaninfo_se()-helper is intended to help drivers avoid open-coding thefor_each_node-loop for getting the channel IDs. The helper provides standard way to detect the ADC channel nodes (by the node name), and a standard way to convert the "reg" -properties to channel identification numbers, used in the structiio_chan_spec. Furthermore, the helper can optionally check the found channel IDs are smaller than given maximum. This is useful for callers which later use the IDs for example for indexing a channel data array.The original driver treated all found child nodes as channel nodes. The new helper requires channel nodes to be named channel[@N]. This should help avoid problems with devices which may contain also other but ADC child nodes. Quick grep from
arch/*with the sun20i-gpadc's compatible string didn't reveal any in-tree .dts with channel nodes named otherwise. Also, same grep shows all the in-tree .dts seem to have channel IDs between 0..num of channels.
Quoted 1 line
Use the new helper.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Matti Vaittinen
maintainerPATCH v8 6/10 iio: adc: Support ROHM BD79124 ADC
In reply to Matti VaittinenThe ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports an automatic measurement mode, with an alarm interrupt for out-of-window measurements. The window is configurable for each channel.
The I2C protocol for manual start of the measurement and data reading is somewhat peculiar. It requires the master to do clock stretching after sending the I2C slave-address until the slave has captured the data. Needless to say this is not well suopported by the I2C controllers.
Thus do not support the BD79124's manual measurement mode but implement the measurements using automatic measurement mode, relying on the BD79124's ability of storing latest measurements into register.
Support also configuring the threshold events for detecting the out-of-window events.
The BD79124 keeps asserting IRQ for as long as the measured voltage is out of the configured window. Thus, prevent the user-space from choking on the events and mask the received event for a fixed duration (1 second) when an event is handled.
The ADC input pins can be also configured as general purpose outputs. Make those pins which don't have corresponding ADC channel node in the device-tree controllable as GPO.
---
Revision history:
v7 => v8:
- Use unsigned for regmap values
- Commit message fine tuning
- Check devm_mutex_init() return value
- Typofixes
- Styling as suggested by Andy
- Handle cases where all pins are ADCs or GPOs
- Report 1 to user to indicate enabled event, regardless the direction.
v6 => v7:
- Styling
v5 => v6:
- Styling as suggested by Jonathan
v4 => v5:
- Drop unused interval defines
- Append unit to interval define and drop a comment
- Drop parenthesis around bitwise negation operation ~
- Use proper block comment style
- Improve the documentation of the re-enabling the events by moving comment explaining early return to the point of the return, and by adding own comment for the reason of locking before calling the re-enabling
- Indenting
- Drop unused struct bd79124_reg_init
- Drop bd79124_init_mux() wrapper and call the regmap_write() directly
v3 => v4:
- Adapt to 'drop diff-channel support' changes to ADC-helpers
- Don't parse fwnode in GPIO valid-mask callback but use pin config cached at probe()
- Drop use of iio_adc_device_channels_by_property()
- Open code the bd79124_reg_init loop (as suggested by Jonathan)
- Use devm variant of mutex_init()
- Styling
v2 => v3:
- Fix uninitialized return value reported by the kernel test robot
- Fix indent
- Adapt to adc-helper changes supporting also single-ended and differential channels
RFC v1 => v2:
- Add event throttling (constant delay of 1 sec)
- rename variable 'd' to 'data'
- Use ADC helpers to detect pins used for ADC
- bd79124 drop MFD and pinmux && handle GPO in this driver
- Drop adc suffix from the IIO file name
--- drivers/iio/adc/Kconfig | 12 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/rohm-bd79124.c | 1138 ++++++++++++++++++++++++++++++++ 3 files changed, 1151 insertions(+) create mode 100644 drivers/iio/adc/rohm-bd79124.c
drivers/iio/adc/Kconfig +12 -0
@@ -1191,6 +1191,18 @@ config RN5T618_ADC This driver can also be built as a module. If so, the module will be called rn5t618-adc. +config ROHM_BD79124 + tristate "Rohm BD79124 ADC driver" + depends on I2C + select REGMAP_I2C + select IIO_ADC_HELPER + help + Say yes here to build support for the ROHM BD79124 ADC. The + ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports + also an automatic measurement mode, with an alarm interrupt for + out-of-window measurements. The window is configurable for each + channel. + config ROCKCHIP_SARADC tristate "Rockchip SARADC driver" depends on ARCH_ROCKCHIP || COMPILE_TEST
drivers/iio/adc/Makefile +1 -0
@@ -109,6 +109,7 @@ obj-$(CONFIG_QCOM_VADC_COMMON) += qcom-vadc-common.o obj-$(CONFIG_RCAR_GYRO_ADC) += rcar-gyroadc.o obj-$(CONFIG_RICHTEK_RTQ6056) += rtq6056.o obj-$(CONFIG_RN5T618_ADC) += rn5t618-adc.o +obj-$(CONFIG_ROHM_BD79124) += rohm-bd79124.o obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.o obj-$(CONFIG_RZG2L_ADC) += rzg2l_adc.o obj-$(CONFIG_SC27XX_ADC) += sc27xx_adc.o
drivers/iio/adc/rohm-bd79124.c new file +1138 -0
1,138 lines not on this page · raw message
Signature · 1 line
2.48.1
Andy Shevchenko
reviewerRe: [PATCH v8 06/10] iio: adc: Support ROHM BD79124 ADC
Quoted 24 lines · Matti Vaittinen
The ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports an automatic measurement mode, with an alarm interrupt for out-of-window measurements. The window is configurable for each channel.
The I2C protocol for manual start of the measurement and data reading is somewhat peculiar. It requires the master to do clock stretching after sending the I2C slave-address until the slave has captured the data. Needless to say this is not well suopported by the I2C controllers.
Thus do not support the BD79124's manual measurement mode but implement the measurements using automatic measurement mode, relying on the BD79124's ability of storing latest measurements into register.
Support also configuring the threshold events for detecting the out-of-window events.
The BD79124 keeps asserting IRQ for as long as the measured voltage is out of the configured window. Thus, prevent the user-space from choking on the events and mask the received event for a fixed duration (1 second) when an event is handled.
The ADC input pins can be also configured as general purpose outputs. Make those pins which don't have corresponding ADC channel node in the device-tree controllable as GPO.
...
drivers/iio/adc/rohm-bd79124.c line 11
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c new file +3
-0+#include <linux/bitfield.h> +#include <linux/bitmap.h> +#include <linux/bits.h>
bits.h is guaranteed by bitmap.h, but it's up to you to leave or remove this line.
Quoted 1 line
+#include <
linux/byteorder/generic.h>
This is incorrect. In some cases it even may produce build failures. Should be asm/byteorder.h...
drivers/iio/adc/rohm-bd79124.c line 24
Quoted 12 lines
drivers/iio/adc/rohm-bd79124.c new file +12
-0+#include <linux/device.h> +#include <linux/delay.h> +#include <linux/devm-helpers.h> +#include <linux/err.h> +#include <linux/gpio/driver.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/irqreturn.h> +#include <linux/module.h> +#include <linux/mod_devicetable.h> +#include <linux/regmap.h> +#include <linux/types.h>
...somewhere here.
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c new file +3
-0+#include <linux/iio/events.h> +#include <linux/iio/iio.h> +#include <linux/iio/adc-helpers.h>
...
drivers/iio/adc/rohm-bd79124.c line 84
Quoted 2 lines
drivers/iio/adc/rohm-bd79124.c new file +2
-0+#define BD79124_GET_LIMIT_REG (ch, dir) ((dir) == IIO_EV_DIR_RISING ? \ + BD79124_GET_HIGH_LIMIT_REG(ch) : BD79124_GET_LOW_LIMIT_REG(ch))
It's hard to read, better to split over few lines:
#define BD79124_GET_LIMIT_REG(ch, dir) \ ((dir) == IIO_EV_DIR_RISING ? \ BD79124_GET_HIGH_LIMIT_REG(ch) : BD79124_GET_LOW_LIMIT_REG(ch))
or alike.
...
Quoted 9 lines
drivers/iio/adc/rohm-bd79124.c new file +9
-0+/* +* The BD79124 does not allow disabling/enabling limit separately for +* one direction only. Hence, we do the disabling by changing the limit +* to maximum/minimum measurable value. This means we need to cache +* the limit in order to maintain it over the time limit is disabled. +*/ +u16 alarm_r_limit[BD79124_MAX_NUM_CHANNELS ]; +u16 alarm_f_limit[BD79124_MAX_NUM_CHANNELS ]; +/* Bitmask of disabled events (for rate limiting) for each channel. */
drivers/iio/adc/rohm-bd79124.c line 122
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c new file +9
-0+int alarm_suppressed[BD79124_MAX_NUM_CHANNELS ]; +/* +* The BD79124 is configured to run the measurements in the background. +* This is done for the event monitoring as well as for the read_raw(). +* Protect the measurement starting/stopping using a mutex. +*/ +struct mutex mutex; +struct delayed_work alm_enable_work; +struct gpio_chip gc;
Hmm... Have you tried to shuffle fields to see if you gain a better code generation. Also I don't remember if I asked about struct device *dev to be the same as in regmap and would it be worse code without it?
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+u8 gpio_valid_mask;
...
drivers/iio/adc/rohm-bd79124.c line 204
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c new file +8
-0+static void bd79124gpo_set (struct gpio_chip *gc,unsigned int offset,int value) +{ +struct bd79124_data *data =gpiochip_get_data (gc); + +if (value) +regmap_set_bits (data->map,BD79124_REG_GPO_VAL ,BIT (offset)); +else +regmap_clear_bits (data->map,BD79124_REG_GPO_VAL ,BIT (offset));
regmap_assign_bits()
Quoted 1 line
+}
...
drivers/iio/adc/rohm-bd79124.c line 214
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c new file +7
-0+static void bd79124gpo_set_multiple (struct gpio_chip *gc,unsigned long *mask, +unsigned long *bits) +{ +unsigned int val; +int ret; +struct bd79124_data *data =gpiochip_get_data (gc); +/* Ensure all GPIOs in 'mask' are set to be GPIOs */
This sounds like it can utilise valid_mask, but it seems you already have it. So the question is what is the practical issue here? I believe the condition below will never be the case.
drivers/iio/adc/rohm-bd79124.c line 225
Quoted 11 lines
drivers/iio/adc/rohm-bd79124.c new file +10
-0+ ret =regmap_read (data->map,BD79124_REG_PINCFG , &val); +if (ret) +return ; +if ((val & *mask) != *mask) { +dev_dbg (data->dev,"Invalid mux config. Can't set value.\n" ); +/* Do not set value for pins configured as ADC inputs */ + *mask &= val; + } + +regmap_update_bits (data->map,BD79124_REG_GPO_VAL , *mask, *bits);
Can you rather utilise the respective bitmap APIs?
Quoted 1 line
+}
...
Quoted 5 lines
drivers/iio/adc/rohm-bd79124.c new file +5
-0+struct bd79124_raw { +u8 bit0_3;/* Is set in high bits of the byte */ +u8 bit4_11; +}; +#define BD79124_RAW_TO_INT (r) ((r.bit4_11 << 4) | (r.bit0_3 >> 4))
drivers/iio/adc/rohm-bd79124.c line 265
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c new file +10
-0+#define BD79124_INT_TO_RAW (val) { \ + .bit4_11 = (val) >> 4, \ + .bit0_3 = (val) << 4, \ +} + +/* +* The high and low limits as well as the recent result values are stored in +* the same way in 2 consequent registers. The first register contains 4 bits +* of the value. These bits are stored in the high bits [7:4] of register, but +* they represent the low bits [3:0] of the value.
I believe this comment should go on top of the data structure. Also this is still confusing as variable name above suggests one bit mapping, while text here is referencing to another. Can you elaborate this more, please?
Like
u8 foo_1; // represents bits 3 2 1 0 x x x x // ? or represents bits 0 1 2 3 x x x x
Quoted 4 lines
+ * The value bits [11:4] are stored in the next register.
+ *
+ * Read data from register and convert to integer.
+ */
...
drivers/iio/adc/rohm-bd79124.c line 278
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c new file +9
-0+static int bd79124_read_reg_to_int (struct bd79124_data *data,int reg, +unsigned int *val) +{ +int ret; +struct bd79124_raw raw; + + ret =regmap_bulk_read (data->map, reg, &raw,sizeof (raw)); +if (ret) { +dev_dbg (data->dev,"bulk_read failed %d\n" , ret);
Do we need this (and alike)? It can be achieved via regmap tracepoints.
Quoted 7 lines
drivers/iio/adc/rohm-bd79124.c new file +7
-0+return ret; + } + + *val =BD79124_RAW_TO_INT (raw); + +return 0 ; +}
...
Quoted 6 lines
+/*
+ * The high and low limits as well as the recent result values are stored in
+ * the same way in 2 consequent registers. The first register contains 4 bits
+ * of the value. These bits are stored in the high bits [7:4] of register, but
+ * they represent the low bits [3:0] of the value.
+ * The value bits [11:4] are stored in the next register.
Same as above, rather comment once at data type.
Quoted 2 lines
+ * Convert the integer to register format and write it using rmw cycle.
+ */
...
drivers/iio/adc/rohm-bd79124.c line 308
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+ raw.bit0_3 |= (0xf & tmp);
Btw, why Yoda style?
...
Quoted 12 lines
drivers/iio/adc/rohm-bd79124.c new file +12
-0+static int bd79124_stop_measurement (struct bd79124_data *data,int chan) +{ +unsigned int val; +int ret; + +/* See if already stopped */ + ret =regmap_read (data->map,BD79124_REG_AUTO_CHANNELS , &val); +if (!(val &BIT (chan))) +return 0 ; + + ret =regmap_clear_bits (data->map,BD79124_REG_SEQ_CFG , +BD79124_MSK_SEQ_START );
drivers/iio/adc/rohm-bd79124.c line 452
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c new file +10
-0+ +/* Clear the channel from the measured channels */ + ret =regmap_write (data->map,BD79124_REG_AUTO_CHANNELS , + ~BIT (chan) & val); +if (ret) +return ret; + +/* +* Stop background conversion for power saving if it was the last +* channel
Missing period.
Review
Quoted 2 lines
(quoted diff) +2
-0+ */ + if (!(~BIT(chan) & val)) {
Seems to me as you have the same above, perhaps just update the val?
Quoted 12 lines
drivers/iio/adc/rohm-bd79124.c new file +12
-0+int regval =FIELD_PREP (BD79124_MSK_CONV_MODE , +BD79124_CONV_MODE_MANSEQ ); + + ret =regmap_update_bits (data->map,BD79124_REG_OPMODE_CFG , +BD79124_MSK_CONV_MODE , regval); +if (ret) +return ret; + } + +return regmap_set_bits (data->map,BD79124_REG_SEQ_CFG , +BD79124_MSK_SEQ_START ); +}
...
drivers/iio/adc/rohm-bd79124.c line 535
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c new file +3
-0+/* Add the channel to the list of monitored channels */ + ret =regmap_set_bits (data->map,BD79124_REG_ALERT_CH_SEL , +BIT (channel));
Perfectly one line, and you have similar cases with 82 characters already, while here it's just 81.
Quoted 2 lines
(quoted diff) +2
-0+ if (ret) + return ret;
...
drivers/iio/adc/rohm-bd79124.c line 566
Quoted 2 lines
drivers/iio/adc/rohm-bd79124.c new file +2
-0+return regmap_set_bits (data->map,BD79124_REG_GEN_CFG , +BD79124_MSK_DWC_EN );
Can be done here, as it's only 83 characters.
...
drivers/iio/adc/rohm-bd79124.c line 601
Quoted 11 lines
drivers/iio/adc/rohm-bd79124.c new file +11
-0+{ +struct bd79124_data *data =iio_priv (iio_dev); +int reg; + +if (chan->channel >=BD79124_MAX_NUM_CHANNELS ) +return -EINVAL ; + +switch (info) { +case IIO_EV_INFO_VALUE : +if (dir ==IIO_EV_DIR_RISING ) { +guard (mutex)(&data->mutex);
What does this mutex protect? chan->channel access? I don't think so, then it can be scoped_guard().
drivers/iio/adc/rohm-bd79124.c line 606
Quoted 4 lines
drivers/iio/adc/rohm-bd79124.c new file +4
-0+ data->alarm_r_limit[chan->channel] = val; + reg =BD79124_GET_HIGH_LIMIT_REG (chan->channel); + }else if (dir ==IIO_EV_DIR_FALLING ) { +guard (mutex)(&data->mutex);
Ditto.
Quoted 26 lines
drivers/iio/adc/rohm-bd79124.c new file +26
-0+ data->alarm_f_limit[chan->channel] = val; + reg =BD79124_GET_LOW_LIMIT_REG (chan->channel); + }else { +return -EINVAL ; + } +/* +* We don't want to enable the alarm if it is not enabled or +* if it is suppressed. In that case skip writing to the +* register. +*/ +if (!(data->alarm_monitored[chan->channel] &BIT (dir)) || + data->alarm_suppressed[chan->channel] &BIT (dir)) +return 0 ; + +return bd79124_write_int_to_reg (data, reg, val); + +case IIO_EV_INFO_HYSTERESIS : + reg =BD79124_GET_HYSTERESIS_REG (chan->channel); + val >>=3 ; + +return regmap_update_bits (data->map, reg,BD79124_MSK_HYSTERESIS , + val); +default : +return -EINVAL ; + } +}
...
Quoted 15 lines
drivers/iio/adc/rohm-bd79124.c new file +15
-0+static int bd79124_read_raw (struct iio_dev *iio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long m) +{ +struct bd79124_data *data =iio_priv (iio_dev); +int ret; + +if (chan->channel >=BD79124_MAX_NUM_CHANNELS ) +return -EINVAL ; + +switch (m) { +case IIO_CHAN_INFO_RAW : + { +unsigned int old_chan_cfg, regval; +int tmp;
drivers/iio/adc/rohm-bd79124.c line 702
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c new file +9
-0+ +guard (mutex)(&data->mutex); + +/* +* Start the automatic conversion. This is needed here if no +* events have been enabled. +*/ + regval =FIELD_PREP (BD79124_MSK_CONV_MODE , +BD79124_CONV_MODE_AUTO );
Only 83 characters for one line.
Quoted 36 lines
drivers/iio/adc/rohm-bd79124.c new file +36
-0+ ret =regmap_update_bits (data->map,BD79124_REG_OPMODE_CFG , +BD79124_MSK_CONV_MODE , regval); +if (ret) +return ret; + + ret =bd79124_single_chan_seq (data, chan->channel, &old_chan_cfg); +if (ret) +return ret; + +/* The maximum conversion time is 6 uS. */ +udelay (6 ); + + ret =bd79124_read_reg_to_int (data, +BD79124_GET_RECENT_RES_REG (chan->channel), val); +/* +* Return the old chan config even if data reading failed in +* order to re-enable the event monitoring. +*/ + tmp =bd79124_single_chan_seq_end (data, old_chan_cfg); +if (tmp) +dev_err (data->dev, +"Failed to return config. Alarms may be disabled\n" ); + +if (ret) +return ret; + +return IIO_VAL_INT ; + } +case IIO_CHAN_INFO_SCALE : + *val = data->vmax /1000 ; + *val2 =BD79124_ADC_BITS ; +return IIO_VAL_FRACTIONAL_LOG2 ; +default : +return -EINVAL ; + } +}
...
Quoted 9 lines
drivers/iio/adc/rohm-bd79124.c new file +9
-0+static int __bd79124_event_ratelimit (struct bd79124_data *data,int reg, +unsigned int limit) +{ +int ret; + +if (limit >BD79124_HIGH_LIMIT_MAX ) +return -EINVAL ; + + ret =bd79124_write_int_to_reg (data, reg, limit);
drivers/iio/adc/rohm-bd79124.c line 826
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c new file +10
-0+if (ret) +return ret; + +/* +* We use 1 sec 'grace period'. At the moment I see no reason to make +* this user configurable. We need an ABI for this if configuration is +* needed. +*/ +schedule_delayed_work (&data->alm_enable_work, +msecs_to_jiffies (1000 ));
Perfectly one line even for the 80 character limit fanatics :-)
Quoted 18 lines
drivers/iio/adc/rohm-bd79124.c new file +17
-0+return 0 ; +} +static int bd79124_get_gpio_pins (const struct iio_chan_spec *cs,int num_channels) +{ +int i, gpio_channels; + +/* +* Let's initialize the mux config to say that all 8 channels are +* GPIOs. Then we can just loop through the iio_chan_spec and clear the +* bits for found ADC channels. +*/ + gpio_channels =GENMASK (7 ,0 ); +for (i =0 ; i < num_channels; i++) + gpio_channels &= ~BIT (cs[i].channel); + +return gpio_channels; +}
...
drivers/iio/adc/rohm-bd79124.c line 1066
Quoted 7 lines
drivers/iio/adc/rohm-bd79124.c new file +7
-0+ ret =devm_iio_adc_device_alloc_chaninfo_se (dev, template, +BD79124_MAX_NUM_CHANNELS -1 , &cs); +if (ret <0 ) { +if (ret == -ENOENT ) + goto register_gpios; +return ret; + }
Also can be written as
ret = devm_iio_adc_device_alloc_chaninfo_se(dev, template, BD79124_MAX_NUM_CHANNELS - 1, &cs); /* Register all channels as GPIOs in case no ADC functionality required */ if (ret == -ENOENT) goto register_gpios; if (ret < 0) return ret;
Signature · 2 lines
With Best Regards, Andy Shevchenko
Matti Vaittinen
maintainerRe: [PATCH v8 06/10] iio: adc: Support ROHM BD79124 ADC
Quoted 35 lines · Andy Shevchenko
Quoted 24 lines · Matti Vaittinen
The ROHM BD79124 is a 12-bit, 8-channel, SAR ADC. The ADC supports an automatic measurement mode, with an alarm interrupt for out-of-window measurements. The window is configurable for each channel.
The I2C protocol for manual start of the measurement and data reading is somewhat peculiar. It requires the master to do clock stretching after sending the I2C slave-address until the slave has captured the data. Needless to say this is not well suopported by the I2C controllers.
Thus do not support the BD79124's manual measurement mode but implement the measurements using automatic measurement mode, relying on the BD79124's ability of storing latest measurements into register.
Support also configuring the threshold events for detecting the out-of-window events.
The BD79124 keeps asserting IRQ for as long as the measured voltage is out of the configured window. Thus, prevent the user-space from choking on the events and mask the received event for a fixed duration (1 second) when an event is handled.
The ADC input pins can be also configured as general purpose outputs. Make those pins which don't have corresponding ADC channel node in the device-tree controllable as GPO.
...
drivers/iio/adc/rohm-bd79124.c line 11
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c new file +3
-0+#include <linux/bitfield.h> +#include <linux/bitmap.h> +#include <linux/bits.h>
bits.his guaranteed bybitmap.h, but it's up to you to leave or remove this line.
Quoted 4 lines
Quoted 1 line
+#include <
linux/byteorder/generic.h>This is incorrect. In some cases it even may produce build failures. Should be
asm/byteorder.h...
I had no idea. Thanks.
Quoted 6 lines
Quoted 6 lines
drivers/iio/adc/rohm-bd79124.c new file +6
-0+#include <linux/device.h> +#include <linux/delay.h> +#include <linux/devm-helpers.h> +#include <linux/err.h> +#include <linux/gpio/driver.h> +#include <linux/i2c.h>
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c line 24
Quoted 6 lines
drivers/iio/adc/rohm-bd79124.c new file +6
-0+#include <linux/interrupt.h> +#include <linux/irqreturn.h> +#include <linux/module.h> +#include <linux/mod_devicetable.h> +#include <linux/regmap.h> +#include <linux/types.h> ...somewhere here.
What is the rationale having the "asm/byteorder.h" located down here?
Quoted 38 lines
Quoted 4 lines
drivers/iio/adc/rohm-bd79124.c new file +3
-0+#include <linux/iio/events.h> +#include <linux/iio/iio.h> +#include <linux/iio/adc-helpers.h> ...
drivers/iio/adc/rohm-bd79124.c line 84
Quoted 2 lines
drivers/iio/adc/rohm-bd79124.c new file +2
-0+#define BD79124_GET_LIMIT_REG (ch, dir) ((dir) == IIO_EV_DIR_RISING ? \ + BD79124_GET_HIGH_LIMIT_REG(ch) : BD79124_GET_LOW_LIMIT_REG(ch))It's hard to read, better to split over few lines:
#define BD79124_GET_LIMIT_REG(ch, dir) \ ((dir) == IIO_EV_DIR_RISING ? \ BD79124_GET_HIGH_LIMIT_REG(ch) : BD79124_GET_LOW_LIMIT_REG(ch))or alike.
...
Quoted 17 lines
drivers/iio/adc/rohm-bd79124.c new file +17
-0+/* +* The BD79124 does not allow disabling/enabling limit separately for +* one direction only. Hence, we do the disabling by changing the limit +* to maximum/minimum measurable value. This means we need to cache +* the limit in order to maintain it over the time limit is disabled. +*/ +u16 alarm_r_limit[BD79124_MAX_NUM_CHANNELS ]; +u16 alarm_f_limit[BD79124_MAX_NUM_CHANNELS ]; +/* Bitmask of disabled events (for rate limiting) for each channel. */ +int alarm_suppressed[BD79124_MAX_NUM_CHANNELS ]; +/* +* The BD79124 is configured to run the measurements in the background. +* This is done for the event monitoring as well as for the read_raw(). +* Protect the measurement starting/stopping using a mutex. +*/ +struct mutex mutex; +struct delayed_work alm_enable_work;
Quoted 4 lines
drivers/iio/adc/rohm-bd79124.c line 122
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+struct gpio_chip gc;Hmm... Have you tried to shuffle fields to see if you gain a better code generation.
No, I haven't. Effects of such suffling would in any case depend on the architecture. Furthermore, it is not expected there will be really many instances of this structure so potential savings would be negligible.
Quoted 2 lines
Also I don't remember if I asked about struct device *dev to be the same as in regmap and would it be worse code without it?
Not sure I understood your comment. Are you suggesting I would extract the device pointer from the regmap in every function where it is needed, instead of storing it here?
If so, I prefer storing the pointer in probe and have it directly usable where prints are wanted/needed. Results cleaner looking code with the cost of one pointer. And again, it is not expected to see this struct instantiated a lot. If this happens we can go optimizing, but until that I prefer cleaner code.
Quoted 4 lines
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+u8 gpio_valid_mask;...
Quoted 10 lines
drivers/iio/adc/rohm-bd79124.c line 204
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c new file +8
-0+static void bd79124gpo_set (struct gpio_chip *gc,unsigned int offset,int value) +{ +struct bd79124_data *data =gpiochip_get_data (gc); + +if (value) +regmap_set_bits (data->map,BD79124_REG_GPO_VAL ,BIT (offset)); +else +regmap_clear_bits (data->map,BD79124_REG_GPO_VAL ,BIT (offset));
regmap_assign_bits()
Thanks. I think I've missed introduction of this function :)
Quoted 12 lines
Quoted 2 lines
+}
...
Quoted 6 lines
drivers/iio/adc/rohm-bd79124.c new file +6
-0+static void bd79124gpo_set_multiple (struct gpio_chip *gc,unsigned long *mask, +unsigned long *bits) +{ +unsigned int val; +int ret; +struct bd79124_data *data =gpiochip_get_data (gc);
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c line 214
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+/* Ensure all GPIOs in 'mask' are set to be GPIOs */ This sounds like it can utilise
valid_mask, but it seems you already have it.
Yes.
Quoted 2 lines
So the question is what is the practical issue here? I believe the condition below will never be the case.
It can until this gets merged:
https://lore.kernel.org/all/cd5e067b80e1bb590027bc3bfa817e7f794f21c3.1741180097.git.mazziesaccount@gmail.com/
Furthermore, the cost of the check is fairly low. Knowing that the drivers tend to get backported (because very few if any device makers use latest kernels) I will keep it here for couple of cycles.
Quoted 4 lines
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c new file +3
-0+ ret =regmap_read (data->map,BD79124_REG_PINCFG , &val); +if (ret) +return ;
Quoted 9 lines
drivers/iio/adc/rohm-bd79124.c line 225
Quoted 7 lines
drivers/iio/adc/rohm-bd79124.c new file +7
-0+if ((val & *mask) != *mask) { +dev_dbg (data->dev,"Invalid mux config. Can't set value.\n" ); +/* Do not set value for pins configured as ADC inputs */ + *mask &= val; + } + +regmap_update_bits (data->map,BD79124_REG_GPO_VAL , *mask, *bits);Can you rather utilise the respective bitmap APIs?
Please elaborate. Which APIs and what's the added benefit? It's not easy for me to see how this could get much simpler.
Quoted 14 lines
Quoted 2 lines
+}
...
Quoted 9 lines
drivers/iio/adc/rohm-bd79124.c new file +9
-0+struct bd79124_raw { +u8 bit0_3;/* Is set in high bits of the byte */ +u8 bit4_11; +}; +#define BD79124_RAW_TO_INT (r) ((r.bit4_11 << 4) | (r.bit0_3 >> 4)) +#define BD79124_INT_TO_RAW (val) { \ + .bit4_11 = (val) >> 4, \ + .bit0_3 = (val) << 4, \ +}
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c line 265
Quoted 6 lines
drivers/iio/adc/rohm-bd79124.c new file +6
-0+ +/* +* The high and low limits as well as the recent result values are stored in +* the same way in 2 consequent registers. The first register contains 4 bits +* of the value. These bits are stored in the high bits [7:4] of register, but +* they represent the low bits [3:0] of the value. I believe this comment should go on top of the data structure.
Not sure. I think having this comment preceding the functions which are actually used to read/write the register makes sense. The structs / macros are only used from this function. Anyone who needs to be reading this code _after_ the review stage, is likely to trace the execution of the functions (and see the structure definitions only when they're used from a function) and not go jumping through the structures alone. Hence, having the explanation of a register layout on top of a function which reads / writes the register.
Quoted 3 lines
Also this is
still confusing as variable name above suggests one bit mapping, while text here is referencing to another. Can you elaborate this more, please?
Huh? Sorry, but I think the text and variable names match.
Variable names in:
struct bd79124_raw {
u8 bit0_3; /* Is set in high bits of the byte */
u8 bit4_11;
};represent the value. Eg, first byte contains the bits [3:0] of the 12bit value. Comment tells that these bits are stored to the high bits of the register. Similarly the "bit4_11" represents the bits of the value. I am fairly sure you didn't think the "bit4_11" was referring to bits of a 8-bit register...
Quoted 5 lines
Like
u8 foo_1; // represents bits 3 2 1 0 x x x x // ? or represents bits 0 1 2 3 x x x x
Now, I don't understand what you're saying here. I've a feeling that type of comment would just make it more confusing - at least for me.
I suppose I could do:
struct bd79124_raw {
- u8 bit0_3; /* Is set in high bits of the byte */ - u8 bit4_11; + u8 val_bit0_3; /* Is set in high bits of the byte */ + u8 val_bit4_11;
};
but I am not at all sure this would help?
Quoted 16 lines
Quoted 4 lines
+ * The value bits [11:4] are stored in the next register.
+ *
+ * Read data from register and convert to integer.
+ */...
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c new file +8
-0+static int bd79124_read_reg_to_int (struct bd79124_data *data,int reg, +unsigned int *val) +{ +int ret; +struct bd79124_raw raw; + + ret =regmap_bulk_read (data->map, reg, &raw,sizeof (raw)); +if (ret) {
Quoted 3 lines
drivers/iio/adc/rohm-bd79124.c line 278
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+dev_dbg (data->dev,"bulk_read failed %d\n" , ret);Do we need this (and alike)? It can be achieved via regmap tracepoints.
I can't speak on anyone else's behalf, but when things fail I am still looking at the prints as a first step. This includes enabling the debugs too. Something like regmap tracepoints would come to play only if I can't find anything using the prints - although, I am not sure I wouldn't try _adding_ prints prior using tracepoints.
This is especially true in use-case like this one. This is a path which handles the user's data-reading. Imagine you're reading ADC data:
cat /sys/bus/iio/.../..._raw
and get an error. I (and I believe many others) would say "dmesg" (or equivalent) as next step. If nothing is visible, changing log level and retrying would be my next step.
regmap tracepoints? Maybe after seeing the "bulk_read failed" - but not as a first thing to try. And, it's not like the driver has polluted each regmap call-site with prints, so cost is again negligible.
Quoted 10 lines
Quoted 7 lines
drivers/iio/adc/rohm-bd79124.c new file +7
-0+return ret; + } + + *val =BD79124_RAW_TO_INT (raw); + +return 0 ; +}...
Quoted 8 lines
Quoted 6 lines
+/*
+ * The high and low limits as well as the recent result values are stored in
+ * the same way in 2 consequent registers. The first register contains 4 bits
+ * of the value. These bits are stored in the high bits [7:4] of register, but
+ * they represent the low bits [3:0] of the value.
+ * The value bits [11:4] are stored in the next register.Same as above, rather comment once at data type.
I think this comment is tightly related to the purpose of this function.
Quoted 9 lines
Quoted 3 lines
+ * Convert the integer to register format and write it using rmw cycle.
+ */...
drivers/iio/adc/rohm-bd79124.c line 308
Quoted 1 line
drivers/iio/adc/rohm-bd79124.c new file +1
-0+ raw.bit0_3 |= (0xf & tmp);Btw, why Yoda style?
I had to google the Yoda style. So, I assume you mean why:
0xf & tmp
and not
tmp & 0xf.
Absolutely for no reason. I suppose it has just been flowing out of my fingers that way :) It can be flipped if it bothers.
Quoted 18 lines
Quoted 18 lines
drivers/iio/adc/rohm-bd79124.c new file +18
-0+static int bd79124_stop_measurement (struct bd79124_data *data,int chan) +{ +unsigned int val; +int ret; + +/* See if already stopped */ + ret =regmap_read (data->map,BD79124_REG_AUTO_CHANNELS , &val); +if (!(val &BIT (chan))) +return 0 ; + + ret =regmap_clear_bits (data->map,BD79124_REG_SEQ_CFG , +BD79124_MSK_SEQ_START ); + +/* Clear the channel from the measured channels */ + ret =regmap_write (data->map,BD79124_REG_AUTO_CHANNELS , + ~BIT (chan) & val); +if (ret) +return ret;
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c line 454
Quoted 6 lines
drivers/iio/adc/rohm-bd79124.c new file +6
-0+ +/* +* Stop background conversion for power saving if it was the last +* channel +*/ +if (!(~BIT (chan) & val)) {Seems to me as you have the same above, perhaps just update the val?
Good catch. This gets much more readable if the 'val' is renamed as 'enabled_chans' and updated in place. Thanks!
Quoted 12 lines
Quoted 12 lines
drivers/iio/adc/rohm-bd79124.c new file +12
-0+int regval =FIELD_PREP (BD79124_MSK_CONV_MODE , +BD79124_CONV_MODE_MANSEQ ); + + ret =regmap_update_bits (data->map,BD79124_REG_OPMODE_CFG , +BD79124_MSK_CONV_MODE , regval); +if (ret) +return ret; + } + +return regmap_set_bits (data->map,BD79124_REG_SEQ_CFG , +BD79124_MSK_SEQ_START ); +}
...
Quoted 1 line
Can be done here, as it's only 83 characters.
The 80 char lines is something we already discussed several times. Won't reply on other places.
Quoted 16 lines
...
drivers/iio/adc/rohm-bd79124.c line 601
Quoted 11 lines
drivers/iio/adc/rohm-bd79124.c new file +11
-0+{ +struct bd79124_data *data =iio_priv (iio_dev); +int reg; + +if (chan->channel >=BD79124_MAX_NUM_CHANNELS ) +return -EINVAL ; + +switch (info) { +case IIO_EV_INFO_VALUE : +if (dir ==IIO_EV_DIR_RISING ) { +guard (mutex)(&data->mutex);What does this mutex protect?
chan->channelaccess? I don't think so, then it can bescoped_guard().
I am not sure I understand what you are after here. I'd be grateful if you explained.
In any case, after taking another look at this, I think the check for suppressed/monitored alarms below is racy. It looks like the mutex should be held for the duration of the whole "case IIO_EV_INFO_VALUE" here. So, thanks.
Quoted 50 lines
drivers/iio/adc/rohm-bd79124.c line 606
Quoted 5 lines
drivers/iio/adc/rohm-bd79124.c new file +4
-0+ data->alarm_r_limit[chan->channel] = val; + reg =BD79124_GET_HIGH_LIMIT_REG (chan->channel); + }else if (dir ==IIO_EV_DIR_FALLING ) { +guard (mutex)(&data->mutex);Ditto.
Quoted 26 lines
drivers/iio/adc/rohm-bd79124.c new file +26
-0+ data->alarm_f_limit[chan->channel] = val; + reg =BD79124_GET_LOW_LIMIT_REG (chan->channel); + }else { +return -EINVAL ; + } +/* +* We don't want to enable the alarm if it is not enabled or +* if it is suppressed. In that case skip writing to the +* register. +*/ +if (!(data->alarm_monitored[chan->channel] &BIT (dir)) || + data->alarm_suppressed[chan->channel] &BIT (dir)) +return 0 ; + +return bd79124_write_int_to_reg (data, reg, val); + +case IIO_EV_INFO_HYSTERESIS : + reg =BD79124_GET_HYSTERESIS_REG (chan->channel); + val >>=3 ; + +return regmap_update_bits (data->map, reg,BD79124_MSK_HYSTERESIS , + val); +default : +return -EINVAL ; + } +}...
Quoted 13 lines
drivers/iio/adc/rohm-bd79124.c new file +13
-0+static int __bd79124_event_ratelimit (struct bd79124_data *data,int reg, +unsigned int limit) +{ +int ret; + +if (limit >BD79124_HIGH_LIMIT_MAX ) +return -EINVAL ; + + ret =bd79124_write_int_to_reg (data, reg, limit); +if (ret) +return ret; + +/*
Quoted 8 lines
drivers/iio/adc/rohm-bd79124.c line 826
Quoted 6 lines
drivers/iio/adc/rohm-bd79124.c new file +6
-0+* We use 1 sec 'grace period'. At the moment I see no reason to make +* this user configurable. We need an ABI for this if configuration is +* needed. +*/ +schedule_delayed_work (&data->alm_enable_work, +msecs_to_jiffies (1000 ));Perfectly one line even for the 80 character limit fanatics :-)
Thanks!
Quoted 32 lines
Quoted 19 lines
drivers/iio/adc/rohm-bd79124.c new file +17
-0+return 0 ; +} +static int bd79124_get_gpio_pins (const struct iio_chan_spec *cs,int num_channels) +{ +int i, gpio_channels; + +/* +* Let's initialize the mux config to say that all 8 channels are +* GPIOs. Then we can just loop through the iio_chan_spec and clear the +* bits for found ADC channels. +*/ + gpio_channels =GENMASK (7 ,0 ); +for (i =0 ; i < num_channels; i++) + gpio_channels &= ~BIT (cs[i].channel); + +return gpio_channels; +}...
drivers/iio/adc/rohm-bd79124.c line 1066
Quoted 7 lines
drivers/iio/adc/rohm-bd79124.c new file +7
-0+ ret =devm_iio_adc_device_alloc_chaninfo_se (dev, template, +BD79124_MAX_NUM_CHANNELS -1 , &cs); +if (ret <0 ) { +if (ret == -ENOENT ) + goto register_gpios; +return ret; + }Also can be written as
Quoted 3 lines
ret = devm_iio_adc_device_alloc_chaninfo_se(dev, template, BD79124_MAX_NUM_CHANNELS - 1, &cs); /* Register all channels as GPIOs in case no ADC functionality required */
I like the comment you added.
Quoted 4 lines
if (ret == -ENOENT) goto register_gpios; if (ret < 0) return ret;
We don't need the other check when return value is > 0. This should be the majority of cases. The no ADC channels case is very unlikely because this IC is meant to be an ADC. Original code reflects that better.
Thanks for the review.
Yours,
-- Matti
Matti Vaittinen
maintainerPATCH v8 7/10 MAINTAINERS: Add IIO ADC helpers
In reply to Matti VaittinenAdd undersigned as a maintainer for the IIO ADC helpers.
---
Revision history:
v2 =>
- No changes
RFC v1 => v2:
- New patch
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -11208,6 +11208,13 @@ L: [email protected] S: Maintained F: drivers/media/rc/iguanair.c +IIO ADC HELPERS +M: Matti Vaittinen <[email protected]> +L: [email protected] +S: Maintained +F: drivers/iio/adc/industrialio-adc.c +F: include/linux/iio/adc-helpers.h + IIO BACKEND FRAMEWORK M: Nuno Sa <[email protected]> R: Olivier Moysan <[email protected]>
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH v8 8/10 MAINTAINERS: Add ROHM BD79124 ADC/GPO
In reply to Matti VaittinenAdd undersigned as a maintainer for the ROHM BD79124 ADC/GPO driver.
---
Revision history:
v2 =>
- No changes
RFC v1 => v2:
- Drop MFD and pinmux drivers
--- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
@@ -20547,6 +20547,11 @@ S: Supported F: drivers/power/supply/bd99954-charger.c F: drivers/power/supply/bd99954-charger.h +ROHM BD79124 ADC / GPO IC +M: Matti Vaittinen <[email protected]> +S: Supported +F: drivers/iio/adc/rohm-bd79124.c + ROHM BH1745 COLOUR SENSOR M: Mudit Sharma <[email protected]> L: [email protected]
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH v8 9/10 net: gianfar: Use device_get_child_node_count_named()
In reply to Matti VaittinenWe can avoid open-coding the loop construct which counts firmware child nodes with a specific name by using the newly added device_get_child_node_count_named().
The gianfar driver has such open-coded loop. Replace it with the device_get_child_node_count_named().
---
Revision history:
v6 =>:
- No changes
v5 (RFC) => v6:
- Drop RFC
- Adapt to changed function name.
It's fair to tell the pros and cons of this patch.
The simplification is there, but it's not a big one. It comes with a cost of getting the property.h included in this driver which currently uses exclusively the of_* APIs.
NOTE: This patch depends on the patch:
[2/10] "property: Add functions to iterate named child"
Compile-tested only!
--- drivers/net/ethernet/freescale/gianfar.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +4 -13
@@ -97,6 +97,7 @@#include <linux/phy_fixed.h> #include <linux/of.h> #include <linux/of_net.h> +#include <linux/property.h> #include "gianfar.h"
@@ -571,18 +572,6 @@ static int gfar_parse_group(struct device_node *np,return 0 ; } -static int gfar_of_group_count (struct device_node *np) -{ -struct device_node *child; -int num =0 ; - -for_each_available_child_of_node (np, child) -if (of_node_name_eq (child,"queue-group" )) - num++; - -return num; -} -/* Reads the controller's registers to determine what interface * connects it to the PHY. */
@@ -654,8 +643,10 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) num_rx_qs =1 ; }else {/* MQ_MG_MODE */ /* get the actual number of supported groups */ -unsigned int num_grps =gfar_of_group_count (np); +unsigned int num_grps; + num_grps =device_get_named_child_node_count (&ofdev->dev, +"queue-group" );if (num_grps ==0 || num_grps >MAXGROUPS ) {dev_err (&ofdev->dev,"Invalid # of int groups(%d)\n" , num_grps);
Signature · 1 line
2.48.1
Simon Horman
reviewerRe: [PATCH net-next v8 09/10] net: gianfar: Use device_get_child_node_count_named()
Quoted 10 lines · Matti Vaittinen
We can avoid open-coding the loop construct which counts firmware child nodes with a specific name by using the newly added
device_get_child_node_count_named().The gianfar driver has such open-coded loop. Replace it with the
device_get_child_node_count_named().Suggested-by Andy Shevchenko <[email protected]>Signed-off-by Matti Vaittinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>
This patch looks good to me.
But I think it would be best to resubmit it, as a standalone patch for net-next, once it's dependencies are present in net-next.
Signature · 1 line
pw-bot: defer
Matti Vaittinen
maintainerRe: [PATCH net-next v8 09/10] net: gianfar: Use device_get_child_node_count_named()
Quoted 8 lines · Simon Horman
Quoted 7 lines · Matti Vaittinen
We can avoid open-coding the loop construct which counts firmware child nodes with a specific name by using the newly added
device_get_child_node_count_named().The gianfar driver has such open-coded loop. Replace it with the
device_get_child_node_count_named().
Quoted 8 lines
Quoted 3 lines
Suggested-by Andy Shevchenko <[email protected]>Signed-off-by Matti Vaittinen <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>This patch looks good to me.
But I think it would be best to resubmit it, as a standalone patch for net-next, once it's dependencies are present in net-next.
Thanks Simon. I think you're right.
Matti Vaittinen
maintainerPATCH v8 10/10 media: thp7312: Use helper for iterating named child nodes
In reply to Matti VaittinenSlightly simplify code iterating the child nodes with specific names using the new fwnode_for_each_available_named_child_node().
---
Revision history:
v6 =>:
- No changes
v5 => v6:
- New patch
NOTE: This patch depends on the patch:
[2/10] "property: Add functions to iterate named child"
Compile-tested only!
--- drivers/media/i2c/thp7312.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/media/i2c/thp7312.c +3 -5
@@ -2067,11 +2067,9 @@ static int thp7312_parse_dt(struct thp7312_device *thp7312)return -EINVAL ; } -fwnode_for_each_available_child_node (sensors, node) { -if (fwnode_name_eq (node,"sensor" )) { -if (!thp7312_sensor_parse_dt (thp7312, node)) - num_sensors++; - } +fwnode_for_each_available_named_child_node (sensors, node,"sensor" ) { +if (!thp7312_sensor_parse_dt (thp7312, node)) + num_sensors++; }fwnode_handle_put (sensors);
Signature · 1 line
2.48.1