* [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN
@ 2011-05-11 11:58 michael.hennerich
2011-05-11 11:58 ` [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER michael.hennerich
2011-05-11 12:14 ` [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN Jonathan Cameron
0 siblings, 2 replies; 4+ messages in thread
From: michael.hennerich @ 2011-05-11 11:58 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, drivers, device-drivers-devel, Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
add missing address in IIO_CHAN
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
drivers/staging/iio/iio.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 92609ee..d9f2692 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -136,6 +136,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
.extend_name = _name, \
.channel = _chan, \
.channel2 = _chan2, \
+ .address = _address, \
.info_mask = _inf_mask, \
.scan_index = _si, \
.scan_type = _stype, \
--
1.6.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER
2011-05-11 11:58 [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN michael.hennerich
@ 2011-05-11 11:58 ` michael.hennerich
2011-05-11 12:18 ` Jonathan Cameron
2011-05-11 12:14 ` [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN Jonathan Cameron
1 sibling, 1 reply; 4+ messages in thread
From: michael.hennerich @ 2011-05-11 11:58 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, drivers, device-drivers-devel, Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
Add channel types IIO_CURRENT and IIO_POWER.
This is required for the ADE7758 driver cleanup.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
drivers/staging/iio/iio.h | 2 ++
drivers/staging/iio/industrialio-core.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index d9f2692..80a81d4 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -30,6 +30,8 @@
enum iio_chan_type {
/* real channel types */
IIO_IN,
+ IIO_CURRENT,
+ IIO_POWER,
IIO_ACCEL,
IIO_IN_DIFF,
IIO_GYRO,
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index faa34af..9218fee 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -47,6 +47,8 @@ static const char * const iio_chan_type_name_spec_shared[] = {
[IIO_TIMESTAMP] = "timestamp",
[IIO_ACCEL] = "accel",
[IIO_IN] = "in",
+ [IIO_CURRENT] = "current",
+ [IIO_POWER] = "power",
[IIO_IN_DIFF] = "in-in",
[IIO_GYRO] = "gyro",
[IIO_TEMP] = "temp",
--
1.6.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER
2011-05-11 11:58 ` [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER michael.hennerich
@ 2011-05-11 12:18 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2011-05-11 12:18 UTC (permalink / raw)
To: michael.hennerich; +Cc: linux-iio, drivers, device-drivers-devel
On 05/11/11 12:58, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> Add channel types IIO_CURRENT and IIO_POWER.
> This is required for the ADE7758 driver cleanup.
Will slot this one in right before the ade7758 patches.
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
> drivers/staging/iio/iio.h | 2 ++
> drivers/staging/iio/industrialio-core.c | 2 ++
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
> index d9f2692..80a81d4 100644
> --- a/drivers/staging/iio/iio.h
> +++ b/drivers/staging/iio/iio.h
> @@ -30,6 +30,8 @@
> enum iio_chan_type {
> /* real channel types */
> IIO_IN,
> + IIO_CURRENT,
> + IIO_POWER,
> IIO_ACCEL,
> IIO_IN_DIFF,
> IIO_GYRO,
> diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
> index faa34af..9218fee 100644
> --- a/drivers/staging/iio/industrialio-core.c
> +++ b/drivers/staging/iio/industrialio-core.c
> @@ -47,6 +47,8 @@ static const char * const iio_chan_type_name_spec_shared[] = {
> [IIO_TIMESTAMP] = "timestamp",
> [IIO_ACCEL] = "accel",
> [IIO_IN] = "in",
> + [IIO_CURRENT] = "current",
> + [IIO_POWER] = "power",
> [IIO_IN_DIFF] = "in-in",
> [IIO_GYRO] = "gyro",
> [IIO_TEMP] = "temp",
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN
2011-05-11 11:58 [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN michael.hennerich
2011-05-11 11:58 ` [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER michael.hennerich
@ 2011-05-11 12:14 ` Jonathan Cameron
1 sibling, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2011-05-11 12:14 UTC (permalink / raw)
To: michael.hennerich; +Cc: linux-iio, drivers, device-drivers-devel
On 05/11/11 12:58, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> add missing address in IIO_CHAN
Yikes.
Thanks - will merge into the original patch.
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
> drivers/staging/iio/iio.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
> index 92609ee..d9f2692 100644
> --- a/drivers/staging/iio/iio.h
> +++ b/drivers/staging/iio/iio.h
> @@ -136,6 +136,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
> .extend_name = _name, \
> .channel = _chan, \
> .channel2 = _chan2, \
> + .address = _address, \
> .info_mask = _inf_mask, \
> .scan_index = _si, \
> .scan_type = _stype, \
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-11 15:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-11 11:58 [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN michael.hennerich
2011-05-11 11:58 ` [PATCH 2/2] IIO-work: Add channel types IIO_CURRENT and IIO_POWER michael.hennerich
2011-05-11 12:18 ` Jonathan Cameron
2011-05-11 12:14 ` [PATCH 1/2] IIO-work: iio.h: add missing address in IIO_CHAN Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.