Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b53dc9 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

hwmon: Move the IIO client driver for hwmon out of staging 



This driver uses channel maps, defined either through device tree
or platform data, to create a hwmon driver which acts as a client
for the underlying IIO device channels.  Thus a general purpose
IIO adc driver can be used to provide hardware monitoring using a subset
of its channels.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>

--
 The only non move changes here concern the description and changes to the
 dependencies to IIO explicit and hwmon implicit.

 I'm proposing moving this into hwmon on the basis of placing drivers
 based on what they provide rather than what their underlying hardware
 is.

 drivers/hwmon/Kconfig           |   9 ++
 drivers/hwmon/Makefile          |   1 +
 drivers/hwmon/iio_hwmon.c       | 196 ++++++++++++++++++++++++++++++++++++++++
 drivers/staging/iio/Kconfig     |   8 --
 drivers/staging/iio/Makefile    |   2 -
 drivers/staging/iio/iio_hwmon.c | 196 ----------------------------------------
 6 files changed, 206 insertions(+), 206 deletions(-)
parent 3465a224

drivers/hwmon/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -499,6 +499,15 @@ config SENSORS_IBMPEX 
	  This driver can also be built as a module.  If so, the module

	  will be called ibmpex.



config SENSORS_IIO_HWMON

	tristate "Hwmon driver that uses channels specified via iio maps"

	depends on IIO

	help

	  This is a platform driver that in combination with a suitable

	  map allows IIO devices to provide basic hwmon functionality

	  for those channels specified in the map.  This map can be provided

	  either via platform data or the device tree bindings.



config SENSORS_IT87

	tristate "ITE IT87xx and compatibles"

	depends on !PPC

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o 
obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o

obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o

obj-$(CONFIG_SENSORS_IBMPEX)	+= ibmpex.o

obj-$(CONFIG_SENSORS_IIO_HWMON) += iio_hwmon.o

obj-$(CONFIG_SENSORS_INA209)	+= ina209.o

obj-$(CONFIG_SENSORS_INA2XX)	+= ina2xx.o

obj-$(CONFIG_SENSORS_IT87)	+= it87.o

drivers/staging/iio/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -4,14 +4,6 @@ 
menu "IIO staging drivers"

	depends on IIO



config IIO_ST_HWMON

	tristate "Hwmon driver that uses channels specified via iio maps"

	depends on HWMON

	help

	  This is a platform driver that in combination with a suitable

	  map allows IIO devices to provide  basic hwmon functionality

	  for those channels specified in the map.



source "drivers/staging/iio/accel/Kconfig"

source "drivers/staging/iio/adc/Kconfig"

source "drivers/staging/iio/addac/Kconfig"

drivers/staging/iio/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_BUFFER) += iio_simple_dummy_buffer.o 


obj-$(CONFIG_IIO_DUMMY_EVGEN) += iio_dummy_evgen.o



obj-$(CONFIG_IIO_ST_HWMON) += iio_hwmon.o



obj-y += accel/

obj-y += adc/

obj-y += addac/