Commit 908a4f77 authored Mar 15, 2021 by Sudeep Holla

Merge branch 'ib-iio-scmi-5.12-rc2-take3' of...

Merge branch 'ib-iio-scmi-5.12-rc2-take3' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into for-next/scmi

* 'ib-iio-scmi-5.12-rc2-take3' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio/scmi: Adding support for IIO SCMI Based Sensors

parents 80a064db f774117c

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -8692,6 +8692,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>

drivers/firmware/arm_scmi/driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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" },},
		};

drivers/iio/common/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -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"

drivers/iio/common/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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/

drivers/iio/common/scmi_sensors/Kconfig

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		#
		# 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