Commit 1b33dfa5 authored by Jonathan Cameron's avatar Jonathan Cameron

Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into togreg

Updated to use devm_iio_kfifo_buffer_setup() in place of now
removed devm_iio_kfifo_allocate()

Take3 branch because first 2 versions including wrong version of
patch.
parents 24b84444 f774117c
......@@ -8691,6 +8691,12 @@ S: Maintained
F: Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
F: drivers/iio/multiplexer/iio-mux.c
IIO SCMI BASED DRIVER
M: Jyoti Bhayana <jbhayana@google.com>
L: linux-iio@vger.kernel.org
S: Maintained
F: drivers/iio/common/scmi_sensors/scmi_iio.c
IIO SUBSYSTEM AND DRIVERS
M: Jonathan Cameron <jic23@kernel.org>
R: Lars-Peter Clausen <lars@metafoo.de>
......
......@@ -741,7 +741,7 @@ static struct scmi_prot_devnames devnames[] = {
{ SCMI_PROTOCOL_SYSTEM, { "syspower" },},
{ SCMI_PROTOCOL_PERF, { "cpufreq" },},
{ SCMI_PROTOCOL_CLOCK, { "clocks" },},
{ SCMI_PROTOCOL_SENSOR, { "hwmon" },},
{ SCMI_PROTOCOL_SENSOR, { "hwmon", "iiodev" },},
{ SCMI_PROTOCOL_RESET, { "reset" },},
{ SCMI_PROTOCOL_VOLTAGE, { "regulator" },},
};
......
......@@ -6,5 +6,6 @@
source "drivers/iio/common/cros_ec_sensors/Kconfig"
source "drivers/iio/common/hid-sensors/Kconfig"
source "drivers/iio/common/ms_sensors/Kconfig"
source "drivers/iio/common/scmi_sensors/Kconfig"
source "drivers/iio/common/ssp_sensors/Kconfig"
source "drivers/iio/common/st_sensors/Kconfig"
......@@ -11,5 +11,6 @@
obj-y += cros_ec_sensors/
obj-y += hid-sensors/
obj-y += ms_sensors/
obj-y += scmi_sensors/
obj-y += ssp_sensors/
obj-y += st_sensors/
#
# IIO over SCMI
#
# When adding new entries keep the list in alphabetical order
menu "IIO SCMI Sensors"
config IIO_SCMI
tristate "IIO SCMI"
depends on ARM_SCMI_PROTOCOL
select IIO_BUFFER
select IIO_KFIFO_BUF
help
Say yes here to build support for IIO SCMI Driver.
This provides ARM SCMI Protocol based IIO device.
This driver provides support for accelerometer and gyroscope
sensors available on SCMI based platforms.
endmenu
# SPDX - License - Identifier : GPL - 2.0 - only
#
# Makefile for the IIO over SCMI
#
obj-$(CONFIG_IIO_SCMI) += scmi_iio.o
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment