Skip to content

Commit

Permalink
Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-take3' into …
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
jic23 committed Mar 26, 2021
2 parents 24b8444 + f774117 commit 1b33dfa
Show file tree
Hide file tree
Showing 7 changed files with 704 additions and 1 deletion.
6 changes: 6 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
L: [email protected]
S: Maintained
F: drivers/iio/common/scmi_sensors/scmi_iio.c

IIO SUBSYSTEM AND DRIVERS
M: Jonathan Cameron <[email protected]>
R: Lars-Peter Clausen <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion drivers/firmware/arm_scmi/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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" },},
};
Expand Down
1 change: 1 addition & 0 deletions drivers/iio/common/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions drivers/iio/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
18 changes: 18 additions & 0 deletions drivers/iio/common/scmi_sensors/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# 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
5 changes: 5 additions & 0 deletions drivers/iio/common/scmi_sensors/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX - License - Identifier : GPL - 2.0 - only
#
# Makefile for the IIO over SCMI
#
obj-$(CONFIG_IIO_SCMI) += scmi_iio.o
Loading

0 comments on commit 1b33dfa

Please sign in to comment.