iio: Devicetree support
Subsystems (3)
v3 cover iio: Devicetree support
This patch set adds basic device tree support to the IIO subsystem. It is the result of discussions [1] and [2].
Patch 1 changes the first parameter to iio_channel_get() to be the pointer to the consumer device instead of the consumer device name.
Patch 2 adds basic OF support to the IIO subsystem. Support is modeled after the clock subsystem.
The patches are now based on the to togreg branch of iio kernel repository. Already applied patches are no longer part of the patch set.
I increased the audience to all affected subsystems. Sorry for missing out power and extcon earlier, which are both affected by the first patch.
Guenter
---
[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2
[2] http://marc.info/?l=lm-sensors&m=135375101529918&w=1
A message that is not in the archive (sent off-list or not yet received): 1360009566-26347-1-git-send-email-linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org
PATCH v3 1/2 iio: Update iio_channel_get API to use consumer device pointer as argument
For iio_channel_get to work with OF based configurations, it needs the consumer device pointer instead of the consumer device name as argument.
--- drivers/extcon/extcon-adc-jack.c | 3 +-- drivers/iio/inkern.c | 11 ++++++++++- drivers/power/generic-adc-battery.c | 4 ++-- drivers/power/lp8788-charger.c | 8 ++++---- include/linux/iio/consumer.h | 5 +++-- 5 files changed, 20 insertions(+), 11 deletions(-)
drivers/extcon/extcon-adc-jack.c +1 -2
@@ -135,8 +135,7 @@ static int adc_jack_probe(struct platform_device *pdev) ; data->num_conditions = i; - data->chan =iio_channel_get (dev_name (&pdev->dev), - pdata->consumer_channel); + data->chan =iio_channel_get (&pdev->dev, pdata->consumer_channel);if (IS_ERR (data->chan)) { err =PTR_ERR (data->chan); goto out;
drivers/iio/inkern.c +10 -1
@@ -93,7 +93,8 @@ static const struct iio_chan_spec } -struct iio_channel *iio_channel_get (const char *name,const char *channel_name) +static struct iio_channel *iio_channel_get_sys (const char *name, +const char *channel_name) {struct iio_map_internal *c_i =NULL , *c =NULL ;struct iio_channel *channel;
@@ -144,6 +145,14 @@ error_no_mem:iio_device_put (c->indio_dev);return ERR_PTR (err); } + +struct iio_channel *iio_channel_get (struct device *dev, +const char *channel_name) +{ +const char *name = dev ?dev_name (dev) :NULL ; + +return iio_channel_get_sys (name, channel_name); +}EXPORT_SYMBOL_GPL (iio_channel_get);void iio_channel_release (struct iio_channel *channel)
drivers/power/generic-adc-battery.c +2 -2
@@ -287,8 +287,8 @@ static int gab_probe(struct platform_device *pdev)* based on the channel supported by consumer device. */ for (chan =0 ; chan <ARRAY_SIZE (gab_chan_name); chan++) { - adc_bat->channel[chan] =iio_channel_get (dev_name (&pdev->dev), - gab_chan_name[chan]); + adc_bat->channel[chan] =iio_channel_get (&pdev->dev, + gab_chan_name[chan]);if (IS_ERR (adc_bat->channel[chan])) { ret =PTR_ERR (adc_bat->channel[chan]); }else {
drivers/power/lp8788-charger.c +4 -4
@@ -580,7 +580,7 @@ static void lp8788_irq_unregister(struct platform_device *pdev, } } -static void lp8788_setup_adc_channel (const char *consumer_name, +static void lp8788_setup_adc_channel (struct device *dev,struct lp8788_charger *pchg) {struct lp8788_charger_platform_data *pdata = pchg->pdata;
@@ -590,11 +590,11 @@ static void lp8788_setup_adc_channel(const char *consumer_name,return ;/* ADC channel for battery voltage */ - chan =iio_channel_get (consumer_name, pdata->adc_vbatt); + chan =iio_channel_get (dev, pdata->adc_vbatt); pchg->chan[LP8788_VBATT ] =IS_ERR (chan) ?NULL : chan;/* ADC channel for battery temperature */ - chan =iio_channel_get (consumer_name, pdata->adc_batt_temp); + chan =iio_channel_get (dev, pdata->adc_batt_temp); pchg->chan[LP8788_BATT_TEMP ] =IS_ERR (chan) ?NULL : chan; }
@@ -704,7 +704,7 @@ static int lp8788_charger_probe(struct platform_device *pdev)if (ret)return ret; -lp8788_setup_adc_channel (pdev->name, pchg); +lp8788_setup_adc_channel (&pdev->dev, pchg); ret =lp8788_psy_register (pdev, pchg);if (ret)
include/linux/iio/consumer.h +3 -2
@@ -31,14 +31,15 @@ struct iio_channel {/** * iio_channel_get() - get description of all that is needed to access channel. -* @name: Unique name of the device as provided in the iio_map +* @dev: Pointer to consumer device. Device name must match +* the name of the device as provided in the iio_map * with which the desired provider to consumer mapping * was registered. * @consumer_channel: Unique name to identify the channel on the consumer * side. This typically describes the channels use within * the consumer. E.g. 'battery_voltage' */ -struct iio_channel *iio_channel_get (const char *name, +struct iio_channel *iio_channel_get (struct device *dev,const char *consumer_channel);/**
Signature · 1 line
1.7.9.7
A message that is not in the archive (sent off-list or not yet received): 1360009566-26347-2-git-send-email-linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org
Re: [PATCH 1/2] iio: Update iio_channel_get API to use consumer device pointer as argument
Quoted 11 lines · Guenter Roeck
For
iio_channel_getto work with OF based configurations, it needs the consumer device pointer instead of the consumer device name as argument.Signed-off-by Guenter Roeck <[email protected]>--- drivers/extcon/extcon-adc-jack.c | 3 +-- drivers/iio/inkern.c | 11 ++++++++++- drivers/power/generic-adc-battery.c | 4 ++-- drivers/power/lp8788-charger.c | 8 ++++---- include/linux/iio/consumer.h | 5 +++-- 5 files changed, 20 insertions(+), 11 deletions(-)
Looks OK to me, Ack for drivers/power part.
Thanks.
Anton
Chanwoo Choi
Acked-byRe: [PATCH 1/2] iio: Update iio_channel_get API to use consumer device pointer as argument
In reply to a message not in the archivedrivers/iio/inkern.c static const struct iio_chan_spec
Quoted 31 lines · Guenter Roeck
For
iio_channel_getto work with OF based configurations, it needs the consumer device pointer instead of the consumer device name as argument.Signed-off-by Guenter Roeck <[email protected]>--- drivers/extcon/extcon-adc-jack.c | 3 +-- drivers/iio/inkern.c | 11 ++++++++++- drivers/power/generic-adc-battery.c | 4 ++-- drivers/power/lp8788-charger.c | 8 ++++---- include/linux/iio/consumer.h | 5 +++-- 5 files changed, 20 insertions(+), 11 deletions(-)drivers/extcon/extcon-adc-jack.c +1
-2@@ -135,8 +135,7 @@ static int adc_jack_probe(struct platform_device *pdev) ; data->num_conditions = i; - data->chan =iio_channel_get (dev_name (&pdev->dev), - pdata->consumer_channel); + data->chan =iio_channel_get (&pdev->dev, pdata->consumer_channel);if (IS_ERR (data->chan)) { err =PTR_ERR (data->chan); goto out;drivers/iio/inkern.c +0
-0@@ -93,7 +93,8 @@ static const struct iio_chan_spec
Ack for drivers/extcon .
Thanks,
Chanwoo Choi
A message that is not in the archive (sent off-list or not yet received): [email protected]
Jonathan Cameron
AppliedRe: [PATCH 1/2] iio: Update iio_channel_get API to use consumer device pointer as argument
Quoted 5 lines · Chanwoo Choi
Quoted 4 lines · Guenter Roeck
For
iio_channel_getto work with OF based configurations, it needs the consumer device pointer instead of the consumer device name as argument.Signed-off-by Guenter Roeck <[email protected]>
Applied to togreg branch of iio.git.
Thanks all.
I'll hold off on taking the actual device tree patch (2 of this series) for a day or two to give more time for comments on that.
Quoted 37 lines
drivers/iio/inkern.c static const struct iio_chan_spec
Quoted 26 lines
--- drivers/extcon/extcon-adc-jack.c | 3 +-- drivers/iio/inkern.c | 11 ++++++++++- drivers/power/generic-adc-battery.c | 4 ++-- drivers/power/lp8788-charger.c | 8 ++++---- include/linux/iio/consumer.h | 5 +++-- 5 files changed, 20 insertions(+), 11 deletions(-)drivers/extcon/extcon-adc-jack.c +1
-1@@ -135,8 +135,7 @@ static int adc_jack_probe(struct platform_device *pdev) ; data->num_conditions = i; - data->chan =iio_channel_get (dev_name (&pdev->dev), - pdata->consumer_channel); + data->chan = iio_channel_get(&pdev->dev, pdata->consumer_channel);if (IS_ERR (data->chan)) { err =PTR_ERR (data->chan); goto out;drivers/iio/inkern.c +0
-0@@ -93,7 +93,8 @@ static const struct iio_chan_specAck for
drivers/extcon.Acked-by Chanwoo Choi <[email protected]>Thanks,
Chanwoo ChoiSignature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 2/2 iio: Add OF support
In reply to a message not in the archiveProvide bindings and parse OF data during initialization.
---
One open question is how to assign of_node to the iio device. We can either do it in each driver (which turns out to be a huge patchset), or add something like the following to iio_device_register.
if (!indio_dev->dev.of_node && indio_dev->dev.parent) indio_dev->dev.of_node = indio_dev->dev.parent->of_node;
v3:
- Cleaned up documentation (formatting, left-over clock references)
- Updated bindings description to permit sub-devices
- When searching for iio devices, use the pointer to the iio device type instead of strcmp. Rename iio_dev_type to iio_device_type (to match other device types) and make it global for that purpose. Check the OF node first, then the device type, as the node is less likely to match.
- Move the common code in of_iio_channel_get and of_iio_channel_get_all to __of_iio_channel_get.
- Return NULL from of_iio_channel_get_by_name if nothing is found, or an error if there is a problem with consistency or if the provider device is not yet available.
- In iio_channel_get, return if of_iio_channel_get_by_name() returns a channel or an error, and continue otherwise.
v2:
- Rebased to iio/togreg
- Documentation update per feedback
- Dropped io-channel-output-names from the bindings document. The property is not used in the code, and it is not entirely clear what it would be used for. If there is a need for it, we can add it back in later on.
- Don't export OF specific API calls
- For OF support, no longer depend on iio_map
- Add #ifdef CONFIG_OF where appropriate, and ensure that the code still builds if it is not selected.
- Change iio_channel_get to take device pointer as argument instead of device name. Retain old API as of_iio_channel_get_sys.
- iio_channel_get now works for both OF and non-OF configurations
- Use regulator to get vref for max1363 driver.
.../devicetree/bindings/iio/iio-bindings.txt | 90 +++++++++++ drivers/iio/iio_core.h | 1 + drivers/iio/industrialio-core.c | 4 +- drivers/iio/inkern.c | 171 ++++++++++++++++++++ 4 files changed, 264 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/iio-bindings.txt
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +90 -0
@@ -0,0 +1,90 @@ +This binding is a work-in-progress. It is derived from clock bindings, +and based on suggestions from Lars-Peter Clausen [1]. + +Sources of IIO channels can be represented by any node in the device +tree. Those nodes are designated as IIO providers. IIO consumer +nodes use a phandle and IIO specifier pair to connect IIO provider +outputs to IIO inputs. Similar to the gpio specifiers, an IIO +specifier is an array of one or more cells identifying the IIO +output on a device. The length of an IIO specifier is defined by the +value of a #io-channel-cells property in the IIO provider node. + +[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2 + +==IIO providers== + +Required properties: +#io-channel-cells: Number of cells in an IIO specifier; Typically 0 for nodes + with a single IIO output and 1 for nodes with multiple + IIO outputs. + +Example for a simple configuration with no trigger: + + adc: voltage-sensor@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>; + }; + }; + +==IIO consumers== + +Required properties: +io-channels: List of phandle and IIO specifier pairs, one pair + for each IIO input to the device. Note: if the + IIO provider specifies '0' for #io-channel-cells, + then only the phandle portion of the pair will appear. + +Optional properties: +io-channel-names: + List of IIO input name strings sorted in the same + order as the io-channels property. Consumers drivers + will use io-channel-names to match IIO input names + with IIO specifiers. +io-channel-ranges: + Empty property indicating that child nodes can inherit named + IIO channels from this node. Useful for bus nodes to provide + and IIO channel to their children. + +For example: + + device { + io-channels = <&adc 1>, <&ref 0>; + io-channel-names = "vcc", "vdd"; + }; + +This represents a device with two IIO inputs, named "vcc" and "vdd". +The vcc channel is connected to output 1 of the &adc device, and the +vdd channel is connected to output 0 of the &ref device. + +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V"; + };
drivers/iio/iio_core.h +1 -0
@@ -18,6 +18,7 @@struct iio_chan_spec ;struct iio_dev ; +extern struct device_type iio_device_type; int __iio_add_chan_devattr(const char *postfix, struct iio_chan_spec const *chan,
drivers/iio/industrialio-core.c +2 -2
@@ -847,7 +847,7 @@ static void iio_dev_release(struct device *device)kfree (indio_dev); } -static struct device_type iio_dev_type = { +struct device_type iio_device_type = { .name ="iio_device" , .release = iio_dev_release, };
@@ -869,7 +869,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)if (dev) { dev->dev.groups = dev->groups; - dev->dev.type = &iio_dev_type; + dev->dev.type = &iio_device_type; dev->dev.bus = &iio_bus_type;device_initialize (&dev->dev);dev_set_drvdata (&dev->dev, (void *)dev);
drivers/iio/inkern.c +171 -0
196 lines not on this page · raw message
Signature · 1 line
1.7.9.7
A message that is not in the archive (sent off-list or not yet received): 1360009566-26347-3-git-send-email-linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org
Re: [PATCH v3 2/2] iio: Add OF support
Quoted 3 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>
Note: One of the parameters to the dummy function of_iio_channel_get_by_name() used when CONFIG_OF is undefined is wrong. I'll fix that in the next version of the patch.
Quoted 382 lines
---
One open question is how to assignof_nodeto the iio device. We can either do it in each driver (which turns out to be a huge patchset), or add something like the following toiio_device_register.if (!indio_dev->dev.of_node && indio_dev->dev.parent) indio_dev->dev.of_node = indio_dev->dev.parent->of_node;v3:
- Cleaned up documentation (formatting, left-over clock references)
- Updated bindings description to permit sub-devices
- When searching for iio devices, use the pointer to the iio device type instead of strcmp. Renameiio_dev_typetoiio_device_type(to match other device types) and make it global for that purpose. Check the OF node first, then the device type, as the node is less likely to match.
- Move the common code inof_iio_channel_getandof_iio_channel_get_allto__of_iio_channel_get.
- Return NULL fromof_iio_channel_get_by_nameif nothing is found, or an error if there is a problem with consistency or if the provider device is not yet available.
- Iniio_channel_get, return ifof_iio_channel_get_by_name()returns a channel or an error, and continue otherwise.
v2:
- Rebased to iio/togreg
- Documentation update per feedback
- Dropped io-channel-output-names from the bindings document. The property is not used in the code, and it is not entirely clear what it would be used for. If there is a need for it, we can add it back in later on.
- Don't export OF specific API calls
- For OF support, no longer depend oniio_map
- Add #ifdefCONFIG_OFwhere appropriate, and ensure that the code still builds if it is not selected.
- Changeiio_channel_getto take device pointer as argument instead of device name. Retain old API asof_iio_channel_get_sys.
-iio_channel_getnow works for both OF and non-OF configurations
- Use regulator to get vref for max1363 driver..../devicetree/bindings/iio/iio-bindings.txt | 90 +++++++++++ drivers/iio/iio_core.h | 1 + drivers/iio/industrialio-core.c | 4 +- drivers/iio/inkern.c | 171 ++++++++++++++++++++ 4 files changed, 264 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/iio-bindings.txtDocumentation/devicetree/bindings/iio/iio-bindings.txt new file +90
-0@@ -0,0 +1,90 @@ +This binding is a work-in-progress. It is derived from clock bindings, +and based on suggestions from Lars-Peter Clausen [1]. + +Sources of IIO channels can be represented by any node in the device +tree. Those nodes are designated as IIO providers. IIO consumer +nodes use a phandle and IIO specifier pair to connect IIO provider +outputs to IIO inputs. Similar to the gpio specifiers, an IIO +specifier is an array of one or more cells identifying the IIO +output on a device. The length of an IIO specifier is defined by the +value of a #io-channel-cells property in the IIO provider node. + +[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2 + +==IIO providers== + +Required properties: +#io-channel-cells: Number of cells in an IIO specifier; Typically 0 for nodes + with a single IIO output and 1 for nodes with multiple + IIO outputs. + +Example for a simple configuration with no trigger: + + adc: voltage-sensor@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>; + }; + }; + +==IIO consumers== + +Required properties: +io-channels: List of phandle and IIO specifier pairs, one pair + for each IIO input to the device. Note: if the + IIO provider specifies '0' for #io-channel-cells, + then only the phandle portion of the pair will appear. + +Optional properties: +io-channel-names: + List of IIO input name strings sorted in the same + order as the io-channels property. Consumers drivers + will use io-channel-names to match IIO input names + with IIO specifiers. +io-channel-ranges: + Empty property indicating that child nodes can inherit named + IIO channels from this node. Useful for bus nodes to provide + and IIO channel to their children. + +For example: + + device { + io-channels = <&adc 1>, <&ref 0>; + io-channel-names = "vcc", "vdd"; + }; + +This represents a device with two IIO inputs, named "vcc" and "vdd". +The vcc channel is connected to output 1 of the &adc device, and the +vdd channel is connected to output 0 of the &ref device. + +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V"; + };drivers/iio/iio_core.h +1
-0@@ -18,6 +18,7 @@struct iio_chan_spec ;struct iio_dev ; +extern struct device_type iio_device_type; int __iio_add_chan_devattr(const char *postfix, struct iio_chan_spec const *chan,drivers/iio/industrialio-core.c +2
-2@@ -847,7 +847,7 @@ static void iio_dev_release(struct device *device)kfree (indio_dev); } -static struct device_type iio_dev_type = { +struct device_type iio_device_type = { .name ="iio_device" , .release = iio_dev_release, };@@ -869,7 +869,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)if (dev) { dev->dev.groups = dev->groups; - dev->dev.type = &iio_dev_type; + dev->dev.type = &iio_device_type; dev->dev.bus = &iio_bus_type;device_initialize (&dev->dev);dev_set_drvdata (&dev->dev, (void *)dev);drivers/iio/inkern.c +171
-0@@ -10,6 +10,7 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/mutex.h> +#include <linux/of.h> #include <linux/iio/iio.h> #include "iio_core.h" @@ -92,6 +93,164 @@ static const struct iio_chan_specreturn chan; } +#ifdef CONFIG_OF + +static int iio_dev_node_match (struct device *dev,void *data) +{ +return dev->of_node == data && dev->type == &iio_device_type; +} + +static int __of_iio_channel_get (struct iio_channel *channel, +struct device_node *np,int index) +{ +struct device *idev; +struct iio_dev *indio_dev; +int err; +struct of_phandle_args iiospec; + + err =of_parse_phandle_with_args (np,"io-channels" , +"#io-channel-cells" , + index, &iiospec); +if (err) +return err; + + idev =bus_find_device (&iio_bus_type,NULL , iiospec.np, + iio_dev_node_match); +of_node_put (iiospec.np); +if (idev ==NULL ) +return -EPROBE_DEFER ; + + indio_dev =dev_to_iio_dev (idev); + channel->indio_dev = indio_dev; + index = iiospec.args_count ? iiospec.args[0 ] :0 ; +if (index >= indio_dev->num_channels) { +return -EINVAL ; + goto err_put; + } + channel->channel = &indio_dev->channels[index]; + +return 0 ; + +err_put: +iio_device_put (indio_dev); +return err; +} + +static struct iio_channel *of_iio_channel_get (struct device_node *np,int index) +{ +struct iio_channel *channel; +int err; + +if (index <0 ) +return ERR_PTR (-EINVAL ); + + channel =kzalloc (sizeof (*channel),GFP_KERNEL ); +if (channel ==NULL ) +return ERR_PTR (-ENOMEM ); + + err =__of_iio_channel_get (channel, np, index); +if (err) + goto err_free_channel; + +return channel; + +err_free_channel: +kfree (channel); +return ERR_PTR (err); +} + +static struct iio_channel *of_iio_channel_get_by_name (struct device_node *np, +const char *name) +{ +struct iio_channel *chan =NULL ; + +/* Walk up the tree of devices looking for a matching iio channel */ +while (np) { +int index =0 ; + +/* +* For named iio channels, first look up the name in the +* "io-channel-names" property. If it cannot be found, the +* index will be an error code, and of_iio_channel_get() +* will fail. +*/ +if (name) + index =of_property_match_string (np,"io-channel-names" , + name); + chan =of_iio_channel_get (np, index); +if (!IS_ERR (chan)) +break ; +else if (name && index >=0 ) { +pr_err ("ERROR: could not get IIO channel %s:%s(%i)\n" , + np->full_name, name ? name :"" , index); +return chan; + } + +/* +* No matching IIO channel found on this node. +* If the parent node has a "io-channel-ranges" property, +* then we can try one of its channels. +*/ + np = np->parent; +if (np && !of_get_property (np,"io-channel-ranges" ,NULL )) +break ; + } +return chan; +} + +static struct iio_channel *of_iio_channel_get_all (struct device *dev) +{ +struct iio_channel *chans; +int i, mapind, nummaps =0 ; +int ret; + +do { + ret =of_parse_phandle_with_args (dev->of_node, +"io-channels" , +"#io-channel-cells" , + nummaps,NULL ); +if (ret <0 ) +break ; + }while (++nummaps); + +if (nummaps ==0 )/* no error, return NULL to search map table */ +return NULL ; + +/* NULL terminated array to save passing size */ + chans =kcalloc (nummaps +1 ,sizeof (*chans),GFP_KERNEL ); +if (chans ==NULL ) +return ERR_PTR (-ENOMEM ); + +/* Search for OF matches */ +for (mapind =0 ; mapind < nummaps; mapind++) { + ret =__of_iio_channel_get (&chans[mapind], dev->of_node, + mapind); +if (ret) + goto error_free_chans; + } +return chans; + +error_free_chans: +for (i =0 ; i < mapind; i++) +iio_device_put (chans[i].indio_dev); +kfree (chans); +return ERR_PTR (ret); +} + +#else /* CONFIG_OF */ + +static inline struct iio_channel * +of_iio_channel_get_by_name (struct device *dev,const char *name) +{ +return ERR_PTR (-ENOENT ); +} + +static inline struct iio_channel *of_iio_channel_get_all (struct device *dev) +{ +return NULL ; +} + +#endif /* CONFIG_OF */ static struct iio_channel *iio_channel_get_sys (const char *name,const char *channel_name)@@ -150,7 +309,14 @@ struct iio_channel *iio_channel_get(struct device *dev, const char *channel_name) {const char *name = dev ?dev_name (dev) :NULL ; +struct iio_channel *channel; +if (dev) { + channel =of_iio_channel_get_by_name (dev->of_node, + channel_name); +if (channel !=NULL ) +return channel; + }return iio_channel_get_sys (name, channel_name); }EXPORT_SYMBOL_GPL (iio_channel_get);@@ -173,6 +339,11 @@ struct iio_channel *iio_channel_get_all(struct device *dev)if (dev ==NULL )return ERR_PTR (-EINVAL ); + + chans =of_iio_channel_get_all (dev); +if (chans) +return chans; + name =dev_name (dev);mutex_lock (&iio_map_list_lock);Signature · 1 line
1.7.9.7
Re: [PATCH v3 2/2] iio: Add OF support
In reply to a message not in the archiveQuoted 11 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>---
One open question is how to assignof_nodeto the iio device. We can either do it in each driver (which turns out to be a huge patchset), or add something like the following toiio_device_register.if (!indio_dev->dev.of_node && indio_dev->dev.parent) indio_dev->dev.of_node = indio_dev->dev.parent->of_node;
[ ... ]
drivers/iio/inkern.c static const struct iio_chan_spec · line 247
Quoted 9 lines
drivers/iio/inkern.c +9
-0+ +#else /* CONFIG_OF */ + +static inline struct iio_channel * +of_iio_channel_get_by_name (struct device *dev,const char *name) +{ +return ERR_PTR (-ENOENT ); +} +
The above should be
static inline struct iio_channel * of_iio_channel_get_by_name(struct device_node *np, const char *name)
{
return NULL;
}Will be fixed in the next version.
Guenter
PATCH v4 2/2 iio: Add OF support
In reply to a message not in the archiveProvide bindings and parse OF data during initialization.
---
v4:
- Fixed wrong parameter to dummy of_iio_channel_get_by_name if CONFIG_OF is undefined, and wrong return value.
- Initialize indio_dev->of_node in iio_device_register if the calling driver neglected to do it.
v3:
- Cleaned up documentation (formatting, left-over clock references)
- Updated bindings description to permit sub-devices
- When searching for iio devices, use the pointer to the iio device type instead of strcmp. Rename iio_dev_type to iio_device_type (to match other device types) and make it global for that purpose. Check the OF node first, then the device type, as the node is less likely to match.
- Move the common code in of_iio_channel_get and of_iio_channel_get_all to __of_iio_channel_get.
- Return NULL from of_iio_channel_get_by_name if nothing is found, or an error if there is a problem with consistency or if the provider device is not yet available.
- In iio_channel_get, return if of_iio_channel_get_by_name() returns a channel or an error, and continue otherwise.
v2:
- Rebased to iio/togreg
- Documentation update per feedback
- Dropped io-channel-output-names from the bindings document. The property is not used in the code, and it is not entirely clear what it would be used for. If there is a need for it, we can add it back in later on.
- Don't export OF specific API calls
- For OF support, no longer depend on iio_map
- Add #ifdef CONFIG_OF where appropriate, and ensure that the code still builds if it is not selected.
- Change iio_channel_get to take device pointer as argument instead of device name. Retain old API as of_iio_channel_get_sys.
- iio_channel_get now works for both OF and non-OF configurations
- Use regulator to get vref for max1363 driver.
drivers/iio/iio_core.h | 1 + drivers/iio/industrialio-core.c | 8 +- drivers/iio/inkern.c | 171 ++++++++++++++++++++ 4 files changed, 268 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/iio-bindings.txt
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +90 -0
@@ -0,0 +1,90 @@ +This binding is a work-in-progress. It is derived from clock bindings, +and based on suggestions from Lars-Peter Clausen [1]. + +Sources of IIO channels can be represented by any node in the device +tree. Those nodes are designated as IIO providers. IIO consumer +nodes use a phandle and IIO specifier pair to connect IIO provider +outputs to IIO inputs. Similar to the gpio specifiers, an IIO +specifier is an array of one or more cells identifying the IIO +output on a device. The length of an IIO specifier is defined by the +value of a #io-channel-cells property in the IIO provider node. + +[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2 + +==IIO providers== + +Required properties: +#io-channel-cells: Number of cells in an IIO specifier; Typically 0 for nodes + with a single IIO output and 1 for nodes with multiple + IIO outputs. + +Example for a simple configuration with no trigger: + + adc: voltage-sensor@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>; + }; + }; + +==IIO consumers== + +Required properties: +io-channels: List of phandle and IIO specifier pairs, one pair + for each IIO input to the device. Note: if the + IIO provider specifies '0' for #io-channel-cells, + then only the phandle portion of the pair will appear. + +Optional properties: +io-channel-names: + List of IIO input name strings sorted in the same + order as the io-channels property. Consumers drivers + will use io-channel-names to match IIO input names + with IIO specifiers. +io-channel-ranges: + Empty property indicating that child nodes can inherit named + IIO channels from this node. Useful for bus nodes to provide + and IIO channel to their children. + +For example: + + device { + io-channels = <&adc 1>, <&ref 0>; + io-channel-names = "vcc", "vdd"; + }; + +This represents a device with two IIO inputs, named "vcc" and "vdd". +The vcc channel is connected to output 1 of the &adc device, and the +vdd channel is connected to output 0 of the &ref device. + +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V"; + };
drivers/iio/iio_core.h +1 -0
@@ -18,6 +18,7 @@struct iio_chan_spec ;struct iio_dev ; +extern struct device_type iio_device_type; int __iio_add_chan_devattr(const char *postfix, struct iio_chan_spec const *chan,
drivers/iio/industrialio-core.c +6 -2
@@ -847,7 +847,7 @@ static void iio_dev_release(struct device *device)kfree (indio_dev); } -static struct device_type iio_dev_type = { +struct device_type iio_device_type = { .name ="iio_device" , .release = iio_dev_release, };
@@ -869,7 +869,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)if (dev) { dev->dev.groups = dev->groups; - dev->dev.type = &iio_dev_type; + dev->dev.type = &iio_device_type; dev->dev.bus = &iio_bus_type;device_initialize (&dev->dev);dev_set_drvdata (&dev->dev, (void *)dev);
@@ -960,6 +960,10 @@ int iio_device_register(struct iio_dev *indio_dev) {int ret; +/* If the calling driver did not initialize of_node, do it here */ +if (!indio_dev->dev.of_node && indio_dev->dev.parent) + indio_dev->dev.of_node = indio_dev->dev.parent->of_node; +/* configure elements for the chrdev */ indio_dev->dev.devt =MKDEV (MAJOR (iio_devt), indio_dev->id);
drivers/iio/inkern.c +171 -0
196 lines not on this page · raw message
Signature · 1 line
1.7.9.7
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v4 2/2] iio: Add OF support
Quoted 3 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>
looks good to me. Couple of little queries inline.
Quoted 76 lines
---
v4:
- Fixed wrong parameter to dummyof_iio_channel_get_by_nameifCONFIG_OFis undefined, and wrong return value.
- Initializeindio_dev->of_nodeiniio_device_registerif the calling driver neglected to do it.
v3:
- Cleaned up documentation (formatting, left-over clock references)
- Updated bindings description to permit sub-devices
- When searching for iio devices, use the pointer to the iio device type instead of strcmp. Renameiio_dev_typetoiio_device_type(to match other device types) and make it global for that purpose. Check the OF node first, then the device type, as the node is less likely to match.
- Move the common code inof_iio_channel_getandof_iio_channel_get_allto__of_iio_channel_get.
- Return NULL fromof_iio_channel_get_by_nameif nothing is found, or an error if there is a problem with consistency or if the provider device is not yet available.
- Iniio_channel_get, return ifof_iio_channel_get_by_name()returns a channel or an error, and continue otherwise.
v2:
- Rebased to iio/togreg
- Documentation update per feedback
- Dropped io-channel-output-names from the bindings document. The property is not used in the code, and it is not entirely clear what it would be used for. If there is a need for it, we can add it back in later on.
- Don't export OF specific API calls
- For OF support, no longer depend oniio_map
- Add #ifdefCONFIG_OFwhere appropriate, and ensure that the code still builds if it is not selected.
- Changeiio_channel_getto take device pointer as argument instead of device name. Retain old API asof_iio_channel_get_sys.
-iio_channel_getnow works for both OF and non-OF configurations
- Use regulator to get vref for max1363 driver.drivers/iio/iio_core.h | 1 + drivers/iio/industrialio-core.c | 8 +- drivers/iio/inkern.c | 171 ++++++++++++++++++++ 4 files changed, 268 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/iio-bindings.txtDocumentation/devicetree/bindings/iio/iio-bindings.txt new file +29
-0@@ -0,0 +1,90 @@ +This binding is a work-in-progress. It is derived from clock bindings, +and based on suggestions from Lars-Peter Clausen [1]. + +Sources of IIO channels can be represented by any node in the device +tree. Those nodes are designated as IIO providers. IIO consumer +nodes use a phandle and IIO specifier pair to connect IIO provider +outputs to IIO inputs. Similar to the gpio specifiers, an IIO +specifier is an array of one or more cells identifying the IIO +output on a device. The length of an IIO specifier is defined by the +value of a #io-channel-cells property in the IIO provider node. + +[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2 + +==IIO providers== + +Required properties: +#io-channel-cells: Number of cells in an IIO specifier; Typically 0 for nodes + with a single IIO output and 1 for nodes with multiple + IIO outputs. + +Example for a simple configuration with no trigger: + + adc: voltage-sensor@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + +Example for a configuration with trigger:
Documentation/devicetree/bindings/iio/iio-bindings.txt line 39
Quoted 10 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +10
-0+ + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>;
Why would the trigger have channel-cells?
So far we don't have any device tree stuff for the triggers.
Quoted 40 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +40
-0+ }; + }; + +==IIO consumers== + +Required properties: +io-channels: List of phandle and IIO specifier pairs, one pair + for each IIO input to the device. Note: if the + IIO provider specifies '0' for #io-channel-cells, + then only the phandle portion of the pair will appear. + +Optional properties: +io-channel-names: + List of IIO input name strings sorted in the same + order as the io-channels property. Consumers drivers + will use io-channel-names to match IIO input names + with IIO specifiers. +io-channel-ranges: + Empty property indicating that child nodes can inherit named + IIO channels from this node. Useful for bus nodes to provide + and IIO channel to their children. + +For example: + + device { + io-channels = <&adc 1>, <&ref 0>; + io-channel-names = "vcc", "vdd"; + }; + +This represents a device with two IIO inputs, named "vcc" and "vdd". +The vcc channel is connected to output 1 of the &adc device, and the +vdd channel is connected to output 0 of the &ref device. + +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + };
Documentation/devicetree/bindings/iio/iio-bindings.txt line 89
Quoted 10 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +10
-0+ + ... + + iio_hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V";
This example still seems a little odd. Why give one where there are more channels than names?
Quoted 36 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +1
-0+ };drivers/iio/iio_core.h +1
-0@@ -18,6 +18,7 @@struct iio_chan_spec ;struct iio_dev ; +extern struct device_type iio_device_type; int __iio_add_chan_devattr(const char *postfix, struct iio_chan_spec const *chan,drivers/iio/industrialio-core.c +2
-2@@ -847,7 +847,7 @@ static void iio_dev_release(struct device *device)kfree (indio_dev); } -static struct device_type iio_dev_type = { +struct device_type iio_device_type = { .name ="iio_device" , .release = iio_dev_release, };@@ -869,7 +869,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)if (dev) { dev->dev.groups = dev->groups; - dev->dev.type = &iio_dev_type; + dev->dev.type = &iio_device_type; dev->dev.bus = &iio_bus_type;device_initialize (&dev->dev);dev_set_drvdata (&dev->dev, (void *)dev);
drivers/iio/industrialio-core.c int iio_device_register(struct iio_dev *indio_dev) · line 966
Quoted 7 lines
drivers/iio/industrialio-core.c +4
-0@@ -960,6 +960,10 @@ int iio_device_register(struct iio_dev *indio_dev) {int ret; +/* If the calling driver did not initialize of_node, do it here */ +if (!indio_dev->dev.of_node && indio_dev->dev.parent) + indio_dev->dev.of_node = indio_dev->dev.parent->of_node; +
I guess that's sensible, though I'd be inclined to check it and throw a wobbly if it isn't defined. That way we have one 'right' place to do it.
Quoted 208 lines
drivers/iio/industrialio-core.c +0
-0/* configure elements for the chrdev */ indio_dev->dev.devt =MKDEV (MAJOR (iio_devt), indio_dev->id);drivers/iio/inkern.c +171
-0@@ -10,6 +10,7 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/mutex.h> +#include <linux/of.h> #include <linux/iio/iio.h> #include "iio_core.h" @@ -92,6 +93,164 @@ static const struct iio_chan_specreturn chan; } +#ifdef CONFIG_OF + +static int iio_dev_node_match (struct device *dev,void *data) +{ +return dev->of_node == data && dev->type == &iio_device_type; +} + +static int __of_iio_channel_get (struct iio_channel *channel, +struct device_node *np,int index) +{ +struct device *idev; +struct iio_dev *indio_dev; +int err; +struct of_phandle_args iiospec; + + err =of_parse_phandle_with_args (np,"io-channels" , +"#io-channel-cells" , + index, &iiospec); +if (err) +return err; + + idev =bus_find_device (&iio_bus_type,NULL , iiospec.np, + iio_dev_node_match); +of_node_put (iiospec.np); +if (idev ==NULL ) +return -EPROBE_DEFER ; + + indio_dev =dev_to_iio_dev (idev); + channel->indio_dev = indio_dev; + index = iiospec.args_count ? iiospec.args[0 ] :0 ; +if (index >= indio_dev->num_channels) { +return -EINVAL ; + goto err_put; + } + channel->channel = &indio_dev->channels[index]; + +return 0 ; + +err_put: +iio_device_put (indio_dev); +return err; +} + +static struct iio_channel *of_iio_channel_get (struct device_node *np,int index) +{ +struct iio_channel *channel; +int err; + +if (index <0 ) +return ERR_PTR (-EINVAL ); + + channel =kzalloc (sizeof (*channel),GFP_KERNEL ); +if (channel ==NULL ) +return ERR_PTR (-ENOMEM ); + + err =__of_iio_channel_get (channel, np, index); +if (err) + goto err_free_channel; + +return channel; + +err_free_channel: +kfree (channel); +return ERR_PTR (err); +} + +static struct iio_channel *of_iio_channel_get_by_name (struct device_node *np, +const char *name) +{ +struct iio_channel *chan =NULL ; + +/* Walk up the tree of devices looking for a matching iio channel */ +while (np) { +int index =0 ; + +/* +* For named iio channels, first look up the name in the +* "io-channel-names" property. If it cannot be found, the +* index will be an error code, and of_iio_channel_get() +* will fail. +*/ +if (name) + index =of_property_match_string (np,"io-channel-names" , + name); + chan =of_iio_channel_get (np, index); +if (!IS_ERR (chan)) +break ; +else if (name && index >=0 ) { +pr_err ("ERROR: could not get IIO channel %s:%s(%i)\n" , + np->full_name, name ? name :"" , index); +return chan; + } + +/* +* No matching IIO channel found on this node. +* If the parent node has a "io-channel-ranges" property, +* then we can try one of its channels. +*/ + np = np->parent; +if (np && !of_get_property (np,"io-channel-ranges" ,NULL )) +break ; + } +return chan; +} + +static struct iio_channel *of_iio_channel_get_all (struct device *dev) +{ +struct iio_channel *chans; +int i, mapind, nummaps =0 ; +int ret; + +do { + ret =of_parse_phandle_with_args (dev->of_node, +"io-channels" , +"#io-channel-cells" , + nummaps,NULL ); +if (ret <0 ) +break ; + }while (++nummaps); + +if (nummaps ==0 )/* no error, return NULL to search map table */ +return NULL ; + +/* NULL terminated array to save passing size */ + chans =kcalloc (nummaps +1 ,sizeof (*chans),GFP_KERNEL ); +if (chans ==NULL ) +return ERR_PTR (-ENOMEM ); + +/* Search for OF matches */ +for (mapind =0 ; mapind < nummaps; mapind++) { + ret =__of_iio_channel_get (&chans[mapind], dev->of_node, + mapind); +if (ret) + goto error_free_chans; + } +return chans; + +error_free_chans: +for (i =0 ; i < mapind; i++) +iio_device_put (chans[i].indio_dev); +kfree (chans); +return ERR_PTR (ret); +} + +#else /* CONFIG_OF */ + +static inline struct iio_channel * +of_iio_channel_get_by_name (struct device_node *np,const char *name) +{ +return NULL ; +} + +static inline struct iio_channel *of_iio_channel_get_all (struct device *dev) +{ +return NULL ; +} + +#endif /* CONFIG_OF */ static struct iio_channel *iio_channel_get_sys (const char *name,const char *channel_name)@@ -150,7 +309,14 @@ struct iio_channel *iio_channel_get(struct device *dev, const char *channel_name) {const char *name = dev ?dev_name (dev) :NULL ; +struct iio_channel *channel; +if (dev) { + channel =of_iio_channel_get_by_name (dev->of_node, + channel_name); +if (channel !=NULL ) +return channel; + }return iio_channel_get_sys (name, channel_name); }EXPORT_SYMBOL_GPL (iio_channel_get);@@ -173,6 +339,11 @@ struct iio_channel *iio_channel_get_all(struct device *dev)if (dev ==NULL )return ERR_PTR (-EINVAL ); + + chans =of_iio_channel_get_all (dev); +if (chans) +return chans; + name =dev_name (dev);mutex_lock (&iio_map_list_lock);
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v4 2/2] iio: Add OF support
Quoted 86 lines · Jonathan Cameron
Quoted 3 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>looks good to me. Couple of little queries inline.
Quoted 80 lines
---
v4:
- Fixed wrong parameter to dummyof_iio_channel_get_by_nameifCONFIG_OFis undefined, and wrong return value.
- Initializeindio_dev->of_nodeiniio_device_registerif the calling driver neglected to do it.
v3:
- Cleaned up documentation (formatting, left-over clock references)
- Updated bindings description to permit sub-devices
- When searching for iio devices, use the pointer to the iio device type instead of strcmp. Renameiio_dev_typetoiio_device_type(to match other device types) and make it global for that purpose. Check the OF node first, then the device type, as the node is less likely to match.
- Move the common code inof_iio_channel_getandof_iio_channel_get_allto__of_iio_channel_get.
- Return NULL fromof_iio_channel_get_by_nameif nothing is found, or an error if there is a problem with consistency or if the provider device is not yet available.
- Iniio_channel_get, return ifof_iio_channel_get_by_name()returns a channel or an error, and continue otherwise.
v2:
- Rebased to iio/togreg
- Documentation update per feedback
- Dropped io-channel-output-names from the bindings document. The property is not used in the code, and it is not entirely clear what it would be used for. If there is a need for it, we can add it back in later on.
- Don't export OF specific API calls
- For OF support, no longer depend oniio_map
- Add #ifdefCONFIG_OFwhere appropriate, and ensure that the code still builds if it is not selected.
- Changeiio_channel_getto take device pointer as argument instead of device name. Retain old API asof_iio_channel_get_sys.
-iio_channel_getnow works for both OF and non-OF configurations
- Use regulator to get vref for max1363 driver.drivers/iio/iio_core.h | 1 + drivers/iio/industrialio-core.c | 8 +- drivers/iio/inkern.c | 171 ++++++++++++++++++++ 4 files changed, 268 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/iio-bindings.txtDocumentation/devicetree/bindings/iio/iio-bindings.txt new file +33
-0@@ -0,0 +1,90 @@ +This binding is a work-in-progress. It is derived from clock bindings, +and based on suggestions from Lars-Peter Clausen [1]. + +Sources of IIO channels can be represented by any node in the device +tree. Those nodes are designated as IIO providers. IIO consumer +nodes use a phandle and IIO specifier pair to connect IIO provider +outputs to IIO inputs. Similar to the gpio specifiers, an IIO +specifier is an array of one or more cells identifying the IIO +output on a device. The length of an IIO specifier is defined by the +value of a #io-channel-cells property in the IIO provider node. + +[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2 + +==IIO providers== + +Required properties: +#io-channel-cells: Number of cells in an IIO specifier; Typically 0 for nodes + with a single IIO output and 1 for nodes with multiple + IIO outputs. + +Example for a simple configuration with no trigger: + + adc: voltage-sensor@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>;
Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 39
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>;Why would the trigger have channel-cells?
So far we don't have any device tree stuff for the triggers.
This comes from one of the examples passed around earlier.
Presumably, when triggers are supported through devicetree, you would have more than one per device, meaning you need the same logic as for devices.
Though on the other side that isn't supported yet - I don't have hardware to test, so I can not implement - or, rather, test - devicetree based trigger support. I can take the entire thing out if you prefer - I don't really have a strong opinion.
Quoted 44 lines
Quoted 44 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +44
-0+ }; + }; + +==IIO consumers== + +Required properties: +io-channels: List of phandle and IIO specifier pairs, one pair + for each IIO input to the device. Note: if the + IIO provider specifies '0' for #io-channel-cells, + then only the phandle portion of the pair will appear. + +Optional properties: +io-channel-names: + List of IIO input name strings sorted in the same + order as the io-channels property. Consumers drivers + will use io-channel-names to match IIO input names + with IIO specifiers. +io-channel-ranges: + Empty property indicating that child nodes can inherit named + IIO channels from this node. Useful for bus nodes to provide + and IIO channel to their children. + +For example: + + device { + io-channels = <&adc 1>, <&ref 0>; + io-channel-names = "vcc", "vdd"; + }; + +This represents a device with two IIO inputs, named "vcc" and "vdd". +The vcc channel is connected to output 1 of the &adc device, and the +vdd channel is connected to output 0 of the &ref device. + +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon {
Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 89
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V";This example still seems a little odd. Why give one where there are more channels than names?
I just didn't have a better idea. Do you know of another iio consumer I could use as example, one which doesn't use the get_all API ?
Quoted 39 lines
Quoted 39 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +1
-0+ };drivers/iio/iio_core.h +1
-0@@ -18,6 +18,7 @@struct iio_chan_spec ;struct iio_dev ; +extern struct device_type iio_device_type; int __iio_add_chan_devattr(const char *postfix, struct iio_chan_spec const *chan,drivers/iio/industrialio-core.c +2
-2@@ -847,7 +847,7 @@ static void iio_dev_release(struct device *device)kfree (indio_dev); } -static struct device_type iio_dev_type = { +struct device_type iio_device_type = { .name ="iio_device" , .release = iio_dev_release, };@@ -869,7 +869,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)if (dev) { dev->dev.groups = dev->groups; - dev->dev.type = &iio_dev_type; + dev->dev.type = &iio_device_type; dev->dev.bus = &iio_bus_type;device_initialize (&dev->dev);dev_set_drvdata (&dev->dev, (void *)dev);@@ -960,6 +960,10 @@ int iio_device_register(struct iio_dev *indio_dev) {int ret;
Quoted 7 lines
drivers/iio/industrialio-core.c int iio_device_register(struct iio_dev *indio_dev) · line 966
Quoted 4 lines
drivers/iio/industrialio-core.c +4
-0+/* If the calling driver did not initialize of_node, do it here */ +if (!indio_dev->dev.of_node && indio_dev->dev.parent) + indio_dev->dev.of_node = indio_dev->dev.parent->of_node; +I guess that's sensible, though I'd be inclined to check it and throw a wobbly if it isn't defined. That way we have one 'right' place to do it.
I had to look that one up :). "throw a wobbly" = "reached the end of rational thought and action" or "to become suddenly very agitated or angry". Is that about right ?
I assume you mean the case where indio_dev->dev.of_node is NULL ? Problem is that this can hapen anytime (and always if CONFIG_OF is undefined). I'd be more concerned if indio_dev->dev.parent is NULL, which happens with a couple of drivers if I interpret the code correctly. Otherwise it only matters if the node should really point to a sub-node and not to the parent's node itself - but presumably programmers should detect that while writing the driver.
Alternative would be to set of_node in all calling drivers. Unfortunately, there are about one hundred callers, so that would be a substantial effort.
Not sure myself what the right approach is here - that is why I asked for feedback about it in v3. I am open to suggestions.
Thanks,
Guenter
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v4 2/2] iio: Add OF support
Quoted 147 lines · On Wednesday 06 of February 2013 12:05:13 Guenter Roeck wrote:
Quoted 115 lines · Jonathan Cameron
Quoted 3 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>looks good to me. Couple of little queries inline.
Quoted 108 lines
---
v4:
- Fixed wrong parameter to dummyof_iio_channel_get_by_nameifCONFIG_OFis> >
undefined, and wrong return value.- Initialize
indio_dev->of_nodeiniio_device_registerif the calling driver> >
neglected to do it.v3:
- Cleaned up documentation (formatting, left-over clock references)
- Updated bindings description to permit sub-devices
- When searching for iio devices, use the pointer to the iio device type instead> >
of strcmp. Renameiio_dev_typetoiio_device_type(to match other device types) and make it global for that purpose. Check the OF node first, then the device type, as the node is less likely to match.- Move the common code in
of_iio_channel_getandof_iio_channel_get_allto> >
__of_iio_channel_get.- Return NULL from
of_iio_channel_get_by_nameif nothing is found, oran error if there is a problem with consistency or if the provider device is not yet available.
- In
iio_channel_get, return ifof_iio_channel_get_by_name()returns a channel> >
or an error, and continue otherwise.v2:
- Rebased to iio/togreg
- Documentation update per feedback
- Dropped io-channel-output-names from the bindings document. The property is> >
not used in the code, and it is not entirely clear what it would be used for. If there is a need for it, we can add it back in later on.- Don't export OF specific API calls
- For OF support, no longer depend oniio_map
- Add #ifdefCONFIG_OFwhere appropriate, and ensure that the code still builds> >
if it is not selected.- Change
iio_channel_getto take device pointer as argument instead of device> >
name. Retain old API asof_iio_channel_get_sys.-
iio_channel_getnow works for both OF and non-OF configurations
- Use regulator to get vref for max1363 driver.drivers/iio/iio_core.h | 1 + drivers/iio/industrialio-core.c | 8 +- drivers/iio/inkern.c | 171 ++++++++++++++++++++ 4 files changed, 268 insertions(+), 2 deletions(-) create mode 100644
Documentation/devicetree/bindings/iio/iio-bindings.txt> >(quoted diff) +0
-0
b/Documentation/devicetree/bindings/iio/iio-bindings.txtnew file mode 100644
index 0000000..2475c2eDocumentation/devicetree/bindings/iio/iio-bindings.txt new file +1
-0@@ -0,0 +1,90 @@ +This binding is a work-in-progress. It is derived from clockbindings,
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +3
-0+and based on suggestions from Lars-Peter Clausen [1]. + +Sources of IIO channels can be represented by any node in thedevice
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +5
-0+tree. Those nodes are designated as IIO providers. IIO consumer +nodes use a phandle and IIO specifier pair to connect IIO provider +outputs to IIO inputs. Similar to the gpio specifiers, an IIO +specifier is an array of one or more cells identifying the IIO +output on a device. The length of an IIO specifier is defined bythe
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +8
-0+value of a #io-channel-cells property in the IIO provider node. + +[1] http://marc.info/?l=linux-iio&m=135902119507483&w=2 + +==IIO providers== + +Required properties: +#io-channel-cells: Number of cells in an IIO specifier; Typically 0for nodes + with a single IIO output and 1 for nodes with
multipleDocumentation/devicetree/bindings/iio/iio-bindings.txt new file +16
-0+ IIO outputs. + +Example for a simple configuration with no trigger: + + adc: voltage-sensor@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>; +Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 39
Quoted 5 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +5
-0+ adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>;Why would the trigger have channel-cells?
So far we don't have any device tree stuff for the triggers.This comes from one of the examples passed around earlier.
Presumably, when triggers are supported through devicetree, you would have more than one per device, meaning you need the same logic as for devices.
Though on the other side that isn't supported yet - I don't have hardware to test, so I can not implement - or, rather, test - devicetree based trigger support. I can take the entire thing out if you prefer - I don't really have a strong opinion.
Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +11
-0+ }; + }; + +==IIO consumers== + +Required properties: +io-channels: List of phandle and IIO specifier pairs, one pair + for each IIO input to the device. Note: if the + IIO provider specifies '0' for #io-channel-cells, + then only the phandle portion of the pair will appear. +
Quoted 8 lines
Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt
Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +8
-0+Optional properties: +io-channel-names: + List of IIO input name strings sorted in the same + order as the io-channels property. Consumers drivers + will use io-channel-names to match IIO input names + with IIO specifiers. +io-channel-ranges: + Empty property indicating that child nodes can inherit
named
Quoted 1 line
Quoted 1 line
Documentation/devicetree/bindings/iio/iio-bindings.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +1
-0+ IIO channels from this node. Useful for bus nodes to
provide
Quoted 88 lines
Quoted 27 lines
Quoted 27 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +10
-0+ and IIO channel to their children. + +For example: + + device { + io-channels = <&adc 1>, <&ref 0>; + io-channel-names = "vcc", "vdd"; + }; + +This represents a device with two IIO inputs, named "vcc" and"vdd".
+The vcc channel is connected to output 1 of the &adc device, and theDocumentation/devicetree/bindings/iio/iio-bindings.txt new file +14
-0+vdd channel is connected to output 0 of the &ref device. + +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon { + compatible = "iio-hwmon";Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 89
Quoted 5 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +5
-0+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V";This example still seems a little odd. Why give one where there are more channels than names?
I just didn't have a better idea. Do you know of another iio consumer I could use as example, one which doesn't use the
get_allAPI ?Quoted 49 lines
Quoted 49 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +1
-0+ };drivers/iio/iio_core.h +1
-0@@ -18,6 +18,7 @@struct iio_chan_spec ;struct iio_dev ; +extern struct device_type iio_device_type; int __iio_add_chan_devattr(const char *postfix,drivers/iio/iio_core.h +0
-0struct iio_chan_spec const *chan,(quoted diff) +0
-0
b/drivers/iio/industrialio-core.cindex 8848f16..6d8b027 100644drivers/iio/industrialio-core.c +1
-1@@ -847,7 +847,7 @@ static void iio_dev_release(struct device *device)kfree (indio_dev); } -static struct device_type iio_dev_type = { +struct device_type iio_device_type = {drivers/iio/industrialio-core.c +1
-1.name = "iio_device", .release = iio_dev_release, };@@ -869,7 +869,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)if (dev) { dev->dev.groups = dev->groups; - dev->dev.type = &iio_dev_type; + dev->dev.type = &iio_device_type;drivers/iio/industrialio-core.c +0
-0dev->dev.bus = &iio_bus_type;device_initialize (&dev->dev);dev_set_drvdata (&dev->dev, (void *)dev);
Quoted 8 lines
Quoted 8 lines
drivers/iio/industrialio-core.c int iio_device_register(struct iio_dev · line 966
Quoted 8 lines
drivers/iio/industrialio-core.c +1
-0@@ -960,6 +960,10 @@ int iio_device_register(struct iio_dev *indio_dev) {int ret; +/* If the calling driver did not initialize of_node, do it here
*/
Quoted 19 lines
Quoted 7 lines
drivers/iio/industrialio-core.c int iio_device_register(struct iio_dev *indio_dev) · line 966
Quoted 3 lines
drivers/iio/industrialio-core.c +3
-0+if (!indio_dev->dev.of_node && indio_dev->dev.parent) + indio_dev->dev.of_node = indio_dev->dev.parent->of_node; +I guess that's sensible, though I'd be inclined to check it and throw a wobbly if it isn't defined. That way we have one 'right' place to do it.
I had to look that one up :). "throw a wobbly" = "reached the end of rational thought and action" or "to become suddenly very agitated or angry". Is that about right ?
I assume you mean the case where
indio_dev->dev.of_nodeis NULL ? Problem is that this can hapen anytime (and always ifCONFIG_OFis undefined). I'd be more concerned ifindio_dev->dev.parentis NULL, which happens with a couple of drivers if I interpret the code correctly. Otherwise it only matters if the node should really point to a sub-node and not to the parent's node itself - but presumably programmers should detect that while writing the driver.
Quoted 6 lines
Alternative would be to set
of_nodein all calling drivers. Unfortunately, there are about one hundred callers, so that would be a substantial effort.Not sure myself what the right approach is here - that is why I asked for feedback about it in v3. I am open to suggestions.
I'm not sure if I understand the point, so following might be just some random thoughts:
There is no need to check for of_node. Case where there is no of_node attached to the device is fine, as lots of systems are being booted without device tree support.
Getting of_node from parent device seems reasonable to me, as this will automatically handle all the simple cases where iio_device node would be equal to physical device node.
Best regards,
Tomasz
Re: [PATCH v4 2/2] iio: Add OF support
In reply to a message not in the archiveQuoted 6 lines · Jonathan Cameron
Quoted 3 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>looks good to me. Couple of little queries inline.
[ ... ]
Quoted 6 lines
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>;
Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 39
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>;Why would the trigger have channel-cells?
So far we don't have any device tree stuff for the triggers.
I thought about keeping the example and adding a note that trigger support is not currently implemented, but a better idea is to replace it with a second iio device. I'll do that unless someone objects.
adc@35 {
compatible = "some-vendor,some-adc";
reg = <0x35>;
adc1: iio-device@0 {
#io-channel-cells = <1>;
/* other properties */
};
adc2: iio-device@1 {
#io-channel-cells = <1>;
/* other properties */
};
};Quoted 12 lines
Quoted 12 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +12
-0+ +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon {
Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 89
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V";This example still seems a little odd. Why give one where there are more channels than names?
I replaced the example with
iio_hwmon {
compatible = "iio-hwmon";
io-channels = <&adc 0>, <&adc 1>, <&adc 2>,
<&adc 3>, <&adc 4>, <&adc 5>,
<&adc 6>, <&adc 7>, <&adc 8>,
<&adc 9>;
};
some_consumer {
compatible = "some-consumer";
io-channels = <&adc 10>, <&adc 11>;
io-channel-names = "adc1", "adc2";
};Guenter
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v4 2/2] iio: Add OF support
Quoted 28 lines · Guenter Roeck
Quoted 6 lines · Jonathan Cameron
Quoted 3 lines · Guenter Roeck
Provide bindings and parse OF data during initialization.
Signed-off-by Guenter Roeck <[email protected]>looks good to me. Couple of little queries inline.
[ ... ]
Quoted 6 lines
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ +Example for a configuration with trigger: + + adc@35 { + compatible = "maxim,max1139"; + reg = <0x35>;Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 39
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ + adc: iio-device { + #io-channel-cells = <1>; + }; + trigger: iio-trigger { + #io-channel-cells = <1>;Why would the trigger have channel-cells?
So far we don't have any device tree stuff for the triggers.I thought about keeping the example and adding a note that trigger support is not currently implemented, but a better idea is to replace it with a second iio device. I'll do that unless someone objects.
Quoted 13 lines
adc@35 {
compatible = "some-vendor,some-adc";
reg = <0x35>;
adc1: iio-device@0 {
#io-channel-cells = <1>;
/* other properties */
};
adc2: iio-device@1 {
#io-channel-cells = <1>;
/* other properties */
};
};Agreed.
Quoted 24 lines
Quoted 13 lines
Quoted 13 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +12
-0+ +==Example== + + adc: max1139@35 { + compatible = "maxim,max1139"; + reg = <0x35>; + #io-channel-cells = <1>; + }; + + ... + + iio_hwmon {Quoted 8 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt line 89
Quoted 6 lines
Documentation/devicetree/bindings/iio/iio-bindings.txt new file +6
-0+ compatible = "iio-hwmon"; + io-channels = <&adc 0>, <&adc 1>, <&adc 2>, + <&adc 3>, <&adc 4>, <&adc 5>, + <&adc 6>, <&adc 7>, <&adc 8>, + <&adc 9>, <&adc 10>, <&adc 11>; + io-channel-names = "vcc", "vdd", "vref", "1.2V";This example still seems a little odd. Why give one where there are more channels than names?
I replaced the example with
Quoted 13 lines
iio_hwmon {
compatible = "iio-hwmon";
io-channels = <&adc 0>, <&adc 1>, <&adc 2>,
<&adc 3>, <&adc 4>, <&adc 5>,
<&adc 6>, <&adc 7>, <&adc 8>,
<&adc 9>;
};
some_consumer {
compatible = "some-consumer";
io-channels = <&adc 10>, <&adc 11>;
io-channel-names = "adc1", "adc2";
};Good as well. Much happier with these examples as they won't cause any confusion.
Quoted 7 lines
Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html