mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
ef994fda44
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!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJRTYe3AAoJEFSFNJnE9BaIxfEQAJDxF7GZKG3pJhJIrN40d42y
DZD9Tf28Z5Ynd70gA8lITzwyBuj2r56/xpuewR9SH0nsV+s8zUplUoqBg1B5eIOO
WUg/ojzVjJISyrg+egfkNmwqv7LFkINj9CJfrf2xv99OwjQeCqMc9zHQ1JRK+tl/
57Z1zCZFX3B2dKDalH8sGcuGFRB+TturctvSAO2FTKcQ6/8FmubXD7+4zamn7+lH
vsD6+kRhIQ3yZJSUhLMzbueXfdF9OZe3n7MTbCtLhb76JOLmkGAqnSo0APEndBTb
PyS3DPKFxWJZTzzyKVoEW4pdU/fx2JfOZs101TFDXxh5p1hcALP8zwJQ3CqotYT6
kosGlyrPKaAiqkkGURqsUQvjjfcvNuhFQY2IMHQxFhEIRLYHZTLPJGBV1oBPQ4sQ
/OAOgu+Uut45ZeHAo1bTXcykO8GzvYxvQ18LUY1Jo/5Iqid0nRxVL6CkrA6Uw+z4
Tu4/z3ceeBAx1B34/ty58rkX+Xe6CxPPbzSgCtrV6oMpLZhQegHareItnhxbNRFN
oO9CULLXf6nyFhoYFbZRi+FStfsvdLKjfoDshHNp2kcpqsrTDyjwaTjjTQ4u30MD
VVo7lwVmm0ASpOXyVDPIw7ft/HHUDPH8xz7tPhhZHX5uvs74GCHg0WjZ48WMgv/N
Jk6lERQpZ2x6RYe4eH9+
=99m9
-----END PGP SIGNATURE-----
Merge tag 'iio-for-3.10a' of git://git.kernel.org/pub/scm/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
|
||
|---|---|---|
| .. | ||
| pmbus | ||
| abituguru3.c | ||
| abituguru.c | ||
| acpi_power_meter.c | ||
| ad7314.c | ||
| ad7414.c | ||
| ad7418.c | ||
| adcxx.c | ||
| adm1021.c | ||
| adm1025.c | ||
| adm1026.c | ||
| adm1029.c | ||
| adm1031.c | ||
| adm9240.c | ||
| ads1015.c | ||
| ads7828.c | ||
| ads7871.c | ||
| adt7410.c | ||
| adt7411.c | ||
| adt7462.c | ||
| adt7470.c | ||
| adt7475.c | ||
| amc6821.c | ||
| applesmc.c | ||
| asb100.c | ||
| asc7621.c | ||
| asus_atk0110.c | ||
| atxp1.c | ||
| coretemp.c | ||
| da9052-hwmon.c | ||
| da9055-hwmon.c | ||
| dme1737.c | ||
| ds620.c | ||
| ds1621.c | ||
| emc6w201.c | ||
| emc1403.c | ||
| emc2103.c | ||
| f71805f.c | ||
| f71882fg.c | ||
| f75375s.c | ||
| fam15h_power.c | ||
| fschmd.c | ||
| g760a.c | ||
| gl518sm.c | ||
| gl520sm.c | ||
| gpio-fan.c | ||
| hih6130.c | ||
| hwmon-vid.c | ||
| hwmon.c | ||
| i5k_amb.c | ||
| ibmaem.c | ||
| ibmpex.c | ||
| iio_hwmon.c | ||
| ina2xx.c | ||
| ina209.c | ||
| it87.c | ||
| jc42.c | ||
| jz4740-hwmon.c | ||
| k8temp.c | ||
| k10temp.c | ||
| Kconfig | ||
| lineage-pem.c | ||
| lm63.c | ||
| lm70.c | ||
| lm73.c | ||
| lm75.c | ||
| lm75.h | ||
| lm77.c | ||
| lm78.c | ||
| lm80.c | ||
| lm83.c | ||
| lm85.c | ||
| lm87.c | ||
| lm90.c | ||
| lm92.c | ||
| lm93.c | ||
| lm95241.c | ||
| lm95245.c | ||
| ltc4151.c | ||
| ltc4215.c | ||
| ltc4245.c | ||
| ltc4261.c | ||
| Makefile | ||
| max197.c | ||
| max1111.c | ||
| max1619.c | ||
| max1668.c | ||
| max6639.c | ||
| max6642.c | ||
| max6650.c | ||
| max6697.c | ||
| max16065.c | ||
| mc13783-adc.c | ||
| mcp3021.c | ||
| ntc_thermistor.c | ||
| pc87360.c | ||
| pc87427.c | ||
| pcf8591.c | ||
| s3c-hwmon.c | ||
| sch56xx-common.c | ||
| sch56xx-common.h | ||
| sch5627.c | ||
| sch5636.c | ||
| sht15.c | ||
| sht21.c | ||
| sis5595.c | ||
| smm665.c | ||
| smsc47b397.c | ||
| smsc47m1.c | ||
| smsc47m192.c | ||
| thmc50.c | ||
| tmp102.c | ||
| tmp401.c | ||
| tmp421.c | ||
| twl4030-madc-hwmon.c | ||
| ultra45_env.c | ||
| vexpress.c | ||
| via686a.c | ||
| via-cputemp.c | ||
| vt1211.c | ||
| vt8231.c | ||
| w83l785ts.c | ||
| w83l786ng.c | ||
| w83627ehf.c | ||
| w83627hf.c | ||
| w83781d.c | ||
| w83791d.c | ||
| w83792d.c | ||
| w83793.c | ||
| w83795.c | ||
| wm831x-hwmon.c | ||
| wm8350-hwmon.c | ||