aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <[email protected]>2020-09-29 19:11:11 +0200
committerGreg Kroah-Hartman <[email protected]>2020-09-29 19:11:11 +0200
commit9b1e57ef8100b3aab8d31428df768bbb46614c04 (patch)
tree6d50316e5c9f141bc9c4f718415240e75898c136 /include/linux
parenteca1d82ea858044a27fa95c498cc0835a0b2e17a (diff)
parentda4410d4078ba4ead9d6f1027d6db77c5a74ecee (diff)
Merge tag 'iio-for-5.10c' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes: 3rd set of new device support features and cleanup for IIO in the 5.10 cycle. A late set given it seems the 5.10 cycle is going to start a bit later than expected and quite a bit came in. Includes some late breaking fixes that can wait for the merge window. New device support * ad9467 - ad9434 support including dt bindings update - ad9265 support including dt bindings update Yaml conversion * amlogic,meson-saradc Core rework (heading towards multiple buffer support) * refactor iio_device_register_eventset * Null-ify IIO device's event_interface during unregister. Features * ad7291 - convert from platform_data to devicetree including bindings doc. * core - Add titles to a few IIO config symbols to allow simpler out of tree building. It does little harm so why not enable it. Fixes * ad7292 - Fix missing of_node_put() * at91-sama5d2 - Fix a crash due to missordering of dma enabling as a result of recent IIO wide rework. * gyro-adc - Fix missing of_node_put() * ltc2983 - Fix missing of_node_put() * stm32-adc - Fix an issue with runtime autosuspend related to parent autosuspending. Cleanups * counter/ti-eqep - Tidy up a , instead of ; * buffer-dmaengine - Drop the unmanaged allocator functions as no one is using them. * at91-sama5d2 - devm_platform_get_and_ioremap_resouce() replacing boilerplate. * cros_ec - move the hw fifo attributes setup into the cros_ec core. * gp2ap002 - comment typo * microchip-tcb-capture: - consitifcation * ssp - Use PLATFORM_DEVID_NONE instead of -1 to convey true meaning. * stm32-dfsdm - devm_platform_get_and_ioremap_resouce() replacing boilerplate. * tag 'iio-for-5.10c' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (25 commits) iio: adc: gyroadc: fix leak of device node iterator iio: adc: stm32-adc: fix runtime autosuspend delay when slow polling iio: adc: at91-sama5d2_adc: fix DMA conversion crash iio: ad7292: Fix of_node refcounting iio: ltc2983: Fix of_node refcounting counter: use semicolons rather than commas to separate statements iio: buffer: Kconfig: add title for IIO_TRIGGERED_BUFFER symbol iio: Kconfig: Provide title for IIO_TRIGGERED_EVENT symbol iio: dma-buffer: Kconfig: Provide titles for IIO DMA Kconfig symbols iio: cros_ec: unify hw fifo attributes into the core file dt-bindings: iio: ad9467: add entries for for AD9434 & AD9265 ADCs iio: adc: ad9467: add support for AD9265 high-speed ADC iio: adc: ad9467: add support for AD9434 high-speed ADC iio: adc: ad9467: wrap a axi-adc chip-info into a ad9467_chip_info type iio: buffer-dmaengine: remove non managed alloc/free iio: adc: stm32-dfsdm: Use devm_platform_get_and_ioremap_resource() iio: adc: at91-sama5d2_adc: Use devm_platform_get_and_ioremap_resource() iio: ssp: use PLATFORM_DEVID_NONE dt-bindings: iio: adc: ad7291: add binding iio: adc: ad7291: convert to device tree ...
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/iio/buffer-dmaengine.h4
-rw-r--r--include/linux/iio/common/cros_ec_sensors_core.h4
-rw-r--r--include/linux/platform_data/ad7291.h13
3 files changed, 2 insertions, 19 deletions
diff --git a/include/linux/iio/buffer-dmaengine.h b/include/linux/iio/buffer-dmaengine.h
index 0e503db71289..5b502291d6a4 100644
--- a/include/linux/iio/buffer-dmaengine.h
+++ b/include/linux/iio/buffer-dmaengine.h
@@ -10,10 +10,6 @@
struct iio_buffer;
struct device;
-struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev,
- const char *channel);
-void iio_dmaengine_buffer_free(struct iio_buffer *buffer);
-
struct iio_buffer *devm_iio_dmaengine_buffer_alloc(struct device *dev,
const char *channel);
diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
index caa8bb279a34..c9b80be82440 100644
--- a/include/linux/iio/common/cros_ec_sensors_core.h
+++ b/include/linux/iio/common/cros_ec_sensors_core.h
@@ -96,7 +96,8 @@ struct platform_device;
int cros_ec_sensors_core_init(struct platform_device *pdev,
struct iio_dev *indio_dev, bool physical_device,
cros_ec_sensors_capture_t trigger_capture,
- cros_ec_sensorhub_push_data_cb_t push_data);
+ cros_ec_sensorhub_push_data_cb_t push_data,
+ bool has_hw_fifo);
irqreturn_t cros_ec_sensors_capture(int irq, void *p);
int cros_ec_sensors_push_data(struct iio_dev *indio_dev,
@@ -125,6 +126,5 @@ extern const struct dev_pm_ops cros_ec_sensors_pm_ops;
/* List of extended channel specification for all sensors. */
extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];
-extern const struct attribute *cros_ec_sensor_fifo_attributes[];
#endif /* __CROS_EC_SENSORS_CORE_H */
diff --git a/include/linux/platform_data/ad7291.h b/include/linux/platform_data/ad7291.h
deleted file mode 100644
index b1fd1530c9a5..000000000000
--- a/include/linux/platform_data/ad7291.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __IIO_AD7291_H__
-#define __IIO_AD7291_H__
-
-/**
- * struct ad7291_platform_data - AD7291 platform data
- * @use_external_ref: Whether to use an external or internal reference voltage
- */
-struct ad7291_platform_data {
- bool use_external_ref;
-};
-
-#endif