From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Mar 2013 17:50:03 +0000 (-0700)
Subject: Merge tag 'iio-for-3.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ef994fda44d6b55ffef7bfdf06f645ff2ab1ab1a;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'iio-for-3.10a' of git://git./linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

First set of IIO new drivers and cleanup for the 3.10 cycle.

New stuff

1) Add OF support for specifying mappings between iio devices and their
   in kernel consumers.
2) Driver for AD7923 (extra functionality and support for ad7904, ad7914 and
   ad7924 added later in series)
3) Driver for Exynos adc (dt suppor for phy added later in series).
4) Make iio_push_event save IRQ context - necessary if it is to be used
   within an interrupt handler.  Users of this functionality to follow.
5) For iio use the device tree node name to provide the hwmon name attribute
   if available.

Removal and moves out of staging

1) Drop the adt7410 driver from IIO now that there is a hmwon driver with
   equivalent support. This device is very much targeted at hardware
   monitoring so hwmon is a more appropriate host for the driver.
2) Move iio_hwmon driver to drivers/hwmon.

Cleanups

1) Minor cleanup in ST common library.
2) Large set of patches to break the info_mask element which previously used
odd and even bits to specify if a channel attribute was either shared across
similar channels or specific to only one.  Now we have two bitmaps, one for
those parameters that are specific to this channel and one for those shared
by all channels with the same type as this one.  This has no effect on the
userspace abi. It simplifies the core code and provides more space for new
channel parameters. It has been on the todo list for a long time!

Conflicts:
	drivers/iio/dac/ad5064.c
---

ef994fda44d6b55ffef7bfdf06f645ff2ab1ab1a
diff --cc drivers/iio/dac/ad5064.c
index 74f2d52795f6,cbbfef5dd79e..aa26d50ab638
--- a/drivers/iio/dac/ad5064.c
+++ b/drivers/iio/dac/ad5064.c
@@@ -296,9 -297,9 +296,9 @@@ static const struct iio_chan_spec_ext_i
  	.indexed = 1,						\
  	.output = 1,						\
  	.channel = (chan),					\
- 	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |		\
- 	IIO_CHAN_INFO_SCALE_SEPARATE_BIT,			\
+ 	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |		\
+ 	BIT(IIO_CHAN_INFO_SCALE),					\
 -	.address = AD5064_ADDR_DAC(chan),			\
 +	.address = addr,					\
  	.scan_type = IIO_ST('u', (bits), 16, 20 - (bits)),	\
  	.ext_info = ad5064_ext_info,				\
  }