Hi Peter,
On Tue, Jun 12, 2012 at 2:55 AM, Peter Meerwald <pmeerw@xxxxxxxxxx> wrote:
> minimal driver, submitting to staging
>
> 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@xxxxxxxxxx>
> ---
> drivers/staging/iio/light/Kconfig | 11 ++
> drivers/staging/iio/light/Makefile | 1 +
> drivers/staging/iio/light/vcnl4000.c | 238 ++++++++++++++++++++++++++++++++++
> 3 files changed, 250 insertions(+)
> create mode 100644 drivers/staging/iio/light/vcnl4000.c
>
> diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
> index 4bed30e..6b8d022 100644
> --- a/drivers/staging/iio/light/Kconfig
> +++ b/drivers/staging/iio/light/Kconfig
> @@ -50,4 +50,15 @@ config TSL2x7x
> tmd2672, tsl2772, tmd2772 devices.
> Provides iio_events and direct access via sysfs.
>
> +config SENSORS_VCNL4000
> + tristate "VCNL4000 combined ALS and proximity sensor"
> + depends on I2C
> + default n
Nit: Thats anyways default can be removed.
> + ---help---
> + Say Y here if you want to build a driver for the VCNL4000
> + combined ambient light and proximity sensor.
> +
> + To compile this driver as a module, choose M here: the
> + module will be called vcnl4000.
> +
> endmenu
> diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
> index 141af1e..ea2c2f2 100644
> --- a/drivers/staging/iio/light/Makefile
> +++ b/drivers/staging/iio/light/Makefile
> @@ -7,3 +7,4 @@ obj-$(CONFIG_SENSORS_ISL29018) += isl29018.o
> obj-$(CONFIG_SENSORS_ISL29028) += isl29028.o
> obj-$(CONFIG_TSL2583) += tsl2583.o
> obj-$(CONFIG_TSL2x7x) += tsl2x7x_core.o
> +obj-$(CONFIG_SENSORS_VCNL4000) += vcnl4000.o
> diff --git a/drivers/staging/iio/light/vcnl4000.c b/drivers/staging/iio/light/vcnl4000.c
> new file mode 100644
> index 0000000..7a28d9e
> --- /dev/null
> +++ b/drivers/staging/iio/light/vcnl4000.c
> @@ -0,0 +1,238 @@
> +/*
> + * vcnl4000.c - Support for Vishay VCNL4000 combined ambient light and
> + * proximity sensor
> + *
> + * Copyright 2012 Peter Meerwald <pmeerw@xxxxxxxxxx>
> + *
> + * This file is subject to the terms and conditions of version 2 of
> + * the GNU General Public License. See the file COPYING in the main
> + * directory of this archive for more details.
> + *
> + * IIO driver for VCNL4000 (7-bit I2C slave address 0x13)
> + *
> + * TODO:
> + * allow to adjust IR current
> + * need scale/calibscale?
> + * proximity threshold and event handling
> + */
> +
> +#include <linux/module.h>
> +#include <linux/i2c.h>
> +#include <linux/err.h>
> +#include <linux/delay.h>
> +
> +#include <linux/iio/iio.h>
> +#include <linux/iio/sysfs.h>
> +
> +#define VCNL4000_DRV_NAME "vcnl4000"
> +
> +#define VCNL4000_COMMAND 0x80 /* Command register */
> +#define VCNL4000_PROD_REV 0x81 /* Product ID and Revision ID */
> +#define VCNL4000_LED_CURRENT 0x83 /* IR LED current for proximity mode */
> +#define VCNL4000_AL_PARAM 0x84 /* Ambient light parameter register */
> +#define VCNL4000_AL_RESULT_HI 0x85 /* Ambient light result register, MSB */
> +#define VCNL4000_AL_RESULT_LO 0x86 /* Ambient light result register, LSB */
> +#define VCNL4000_PS_RESULT_HI 0x87 /* Proximity result register, MSB */
> +#define VCNL4000_PS_RESULT_LO 0x88 /* Proximity result register, LSB */
> +#define VCNL4000_PS_MEAS_FREQ 0x89 /* Proximity measurement signal frequency */
> +#define VCNL4000_PS_MOD_ADJ 0x8a /* Proximity modulator timing adjustment */
> +
> +/* Bit masks for COMMAND register */
> +#define VCNL4000_AL_RDY 0x40 /* ALS data ready? */
> +#define VCNL4000_PS_RDY 0x20 /* proximity data ready? */
> +#define VCNL4000_AL_OD 0x10 /* start on-demand ALS measurement */
> +#define VCNL4000_PS_OD 0x08 /* start on-demand proximity measurement */
> +
> +struct vcnl4000_data {
> + struct i2c_client *client;
> +};
> +
> +static const struct i2c_device_id vcnl4000_id[] = {
> + { "vcnl4000", 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(i2c, vcnl4000_id);
> +
> +static int vcnl4000_read(struct vcnl4000_data *data, u8 reg)
> +{
> + int ret = i2c_smbus_read_byte_data(data->client, reg);
> + if (ret < 0)
> + dev_err(&data->client->dev,
> + "vcnl4000_read() failed, error %d\n", ret);
> + return ret;
> +}
The functions can be called directly.
> +
> +static int vcnl4000_write(struct vcnl4000_data *data, u8 reg, u8 val)
> +{
> + int ret = i2c_smbus_write_byte_data(data->client, reg, val);
> + if (ret < 0)
> + dev_err(&data->client->dev,
> + "vcnl4000_write() failed, error %d\n", ret);
> + return ret;
> +}
Same here
> +
> +static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
> + u8 rdy_mask, u8 data_reg, int *val)
> +{
> + int tries = 20;
> + u16 buf;
> + int ret;
> +
> + ret = vcnl4000_write(data, VCNL4000_COMMAND, req_mask);
> + if (ret < 0)
> + return ret;
> +
> + /* wait for data to become ready */
> + while (tries--) {
> + ret = vcnl4000_read(data, VCNL4000_COMMAND);
> + if (ret < 0)
> + return ret;
> + if (ret & rdy_mask)
> + break;
> + msleep(1);
> + }
> +
> + if (tries < 0) {
> + dev_err(&data->client->dev,
> + "vcnl4000_measure() failed, data not ready\n");
> + return -EIO;
> + }
> +
> + ret = i2c_smbus_read_i2c_block_data(data->client,
> + data_reg, sizeof(buf), (u8 *) &buf);
> + if (ret < 0) {
> + dev_err(&data->client->dev,
> + "vcnl4000_measure() failed, error %d\n", ret);
> + return ret;
> + }
> +
> + *val = be16_to_cpu(buf);
> +
> + return 0;
> +}
> +
> +static const struct iio_chan_spec vcnl4000_channels[] = {
> + {
> + .type = IIO_INTENSITY,
> + .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
> + IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
> + }, {
> + .type = IIO_PROXIMITY,
> + .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT,
> + }
> +};
> +
> +static int vcnl4000_read_raw(struct iio_dev *indio_dev,
> + struct iio_chan_spec const *chan,
> + int *val, int *val2, long mask)
> +{
> + int ret = -EINVAL;
> + struct vcnl4000_data *data = iio_priv(indio_dev);
Does it need some locking? Not sure though.
> +
> + switch (mask) {
> + case IIO_CHAN_INFO_RAW:
> + switch (chan->type) {
> + case IIO_INTENSITY:
> + ret = vcnl4000_measure(data,
> + VCNL4000_AL_OD, VCNL4000_AL_RDY,
> + VCNL4000_AL_RESULT_HI, val);
> + if (ret < 0)
> + return ret;
> + ret = IIO_VAL_INT;
> + break;
> + case IIO_PROXIMITY:
> + ret = vcnl4000_measure(data,
> + VCNL4000_PS_OD, VCNL4000_PS_RDY,
> + VCNL4000_PS_RESULT_HI, val);
> + if (ret < 0)
> + return ret;
> + ret = IIO_VAL_INT;
> + break;
> + default:
> + break;
> + }
> + break;
> + case IIO_CHAN_INFO_SCALE:
> + if (chan->type == IIO_INTENSITY) {
> + *val = 0;
> + *val2 = 250000;
> + ret = IIO_VAL_INT_PLUS_MICRO;
> + }
> + break;
> + default:
> + break;
> + }
> +
> + return ret;
> +}
> +
> +static const struct iio_info vcnl4000_info = {
> + .read_raw = vcnl4000_read_raw,
> + .driver_module = THIS_MODULE,
> +};
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
