summary refs log tree commit diff
path: root/drivers/iio/light/Makefile
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2012-06-19 09:58:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-20 16:12:46 -0700
commit62a1efb9f868690d68b11ffb22dc598e547aa184 (patch)
tree815c2703e9023497fab6ea46f24a155534484f5c /drivers/iio/light/Makefile
parent069f101fa463351f528773d73b74e9b606b3f66a (diff)
downloadlinux-62a1efb9f868690d68b11ffb22dc598e547aa184.tar.gz
iio: add vcnl4000 combined ALS and proximity sensor
minimal driver, no IR current control and proximity/event
handling yet

v5:
* checkpatch warnings
* increase msleep() to 20 ms when waiting for data ready as
  measurement/conversion can take up to 100 ms, 1 ms is too short

v4 (address comments by Jonathan Cameron)
* remove SENSORS_ prefix in Kconfig
* change from IIO_INTENSITY to IIO_LIGHT
* move from staging

v3 (address comments by Shubhrajyoti Datta)
* cleanup Kconfig entry
* call I2C read/write functions directly

v2 (address comments by Lars-Peter Clausen and Jonathan Cameron)
* unify code for reading PS and AL data into
  parameterized _measure() function
* limit wait for data to become ready within 20 tries
* drop IIO_LIGHT channel, add SCALE to IIO_INTENSITY
* drop extra string arguments used for logging purpose only

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light/Makefile')
-rw-r--r--drivers/iio/light/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index c1c23a024cd2..06fa4d3f33ec 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -3,3 +3,4 @@
 #
 
 obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
+obj-$(CONFIG_VCNL4000)		+= vcnl4000.o