From patchwork Sun Feb 24 20:34:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bobby Eshleman X-Patchwork-Id: 10828053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B00C180E for ; Sun, 24 Feb 2019 20:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14BFA29095 for ; Sun, 24 Feb 2019 20:34:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08365294FC; Sun, 24 Feb 2019 20:34:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 845B229095 for ; Sun, 24 Feb 2019 20:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726767AbfBXUeo (ORCPT ); Sun, 24 Feb 2019 15:34:44 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40725 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726458AbfBXUeo (ORCPT ); Sun, 24 Feb 2019 15:34:44 -0500 Received: by mail-pg1-f195.google.com with SMTP id u9so3467857pgo.7; Sun, 24 Feb 2019 12:34:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dBIp23+EHqrm1xQ80GlJgk/pj6cEI1sHtixna8vA1+8=; b=sMWtIGesx0TLLBPDwyKnW1+O9qGQLeWjcfYZJBf8/Y5Wo48VE4nccESu2E7ZUJN+MM zqGGGgpqNyGNwA3o0xpCZW/WYEVys01FrvlEZ7UZQQAwfKlZZuCrJZDavpEiodpJAdHd mhymNEkOkKBqmUuPaYAxm2G7Ue+d7Yx5zjkUCLMFp+spg5rBCL27WrDaseuAyvliZO23 1wUEDrfx3Zy9BQm1C3PMrQD+mUwcdE6Y6H4fBjlUivtP1RwiEinwY8TUB/+0sgR1qobF c46LDu7Ee4eRJ8goiki/s7Ys8z0HnSTBiop4F9EsfzA+qEhqaE9ICzsOOzq8u+x4szfg aeWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dBIp23+EHqrm1xQ80GlJgk/pj6cEI1sHtixna8vA1+8=; b=EcVBLPO8OW/pYfP3Guior+PthesEvsWrmcCPINL/CuZdx+VQkjYgaCQyV1WsPxXGYw eLPdcviffq9WyusK/bMIXmsRQKA6CcsdZzc1cHKl+cCiWG11z0xPi2fEn/cI3ddFCf3s t3/EmDDUItp/4yxituw3uWnJt4vXmwt/FW5ahq4JQtIHnEWhRcmvtzjNTWS6vu+9R5ni TvEJpd6jSYyNSLwURsIHdlb2+geMMNqu6PNZnk2SdCqhhpTNJVdWRLPg6TdAOmkEK2rV UV3gir/k1ak4/jUyTlslZaFcEHXBWDk9Fikc+VDHLbNmnVD2qBBb3GMda6ihVhXao49F /B7g== X-Gm-Message-State: AHQUAubPuRGwGh+B9GqCdmv8VjOUeYBVl4BKCu4pJgFIfybBJMAgOape Xu2ajnEcZcwZnFVD3F1fOS4= X-Google-Smtp-Source: AHgI3IaBKAu0esOUWNl7HPrSGEsaGI9mTPmYZkNHRn/drnSZ//XB3+QX3DdNYtIJTCjz/KLZpnxEYw== X-Received: by 2002:a63:b14d:: with SMTP id g13mr15268539pgp.270.1551040483067; Sun, 24 Feb 2019 12:34:43 -0800 (PST) Received: from bobby.hsd1.or.comcast.net ([2601:1c0:5501:37e2::e774]) by smtp.googlemail.com with ESMTPSA id v12sm4201392pfn.25.2019.02.24.12.34.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Feb 2019 12:34:42 -0800 (PST) From: Robert Eshleman To: bobbyeshleman@gmail.com Cc: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Subject: [PATCH v2 1/3] iio: light: Add driver for ap3216c Date: Sun, 24 Feb 2019 12:34:51 -0800 Message-Id: <42dbbd7568e4216a320c6fd617bd91c1ee045af0.1551037168.git.bobbyeshleman@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for the ap3216c ambient light and proximity sensor. Supported features include: * Illuminance (lux) * Proximity (raw) * IR (raw) * Rising/falling threshold events for illuminance and proximity * Calibration scale for illuminance * Calibration bias for proximity Signed-off-by: Robert Eshleman --- Changes in v2: - Add mutex protection in IRQ handler - Support interrupt clearing for PS and ALS separately - Mask away reserved bits when reading device registers - Use regmap_bulk_read and regmap_bulk_write when possible - Style cleanup drivers/iio/light/Kconfig | 11 + drivers/iio/light/Makefile | 1 + drivers/iio/light/ap3216c.c | 809 ++++++++++++++++++++++++++++++++++++ 3 files changed, 821 insertions(+) create mode 100644 drivers/iio/light/ap3216c.c diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index 36f458433480..74688d19beb1 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -41,6 +41,17 @@ config AL3320A To compile this driver as a module, choose M here: the module will be called al3320a. +config AP3216C + tristate "AP3216C Ambient Light and Proximity sensor" + select REGMAP_I2C + depends on I2C + help + Say Y here to build a driver for the AP3216C Ambient Light and + Proximity sensor. + + To compile this driver as a module, choose M here: the + module will be called ap3216c. + config APDS9300 tristate "APDS9300 ambient light sensor" depends on I2C diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile index 286bf3975372..7d2f8fa0f30d 100644 --- a/drivers/iio/light/Makefile +++ b/drivers/iio/light/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_ACPI_ALS) += acpi-als.o obj-$(CONFIG_ADJD_S311) += adjd_s311.o obj-$(CONFIG_AL3320A) += al3320a.o +obj-$(CONFIG_AP3216C) += ap3216c.o obj-$(CONFIG_APDS9300) += apds9300.o obj-$(CONFIG_APDS9960) += apds9960.o obj-$(CONFIG_BH1750) += bh1750.o diff --git a/drivers/iio/light/ap3216c.c b/drivers/iio/light/ap3216c.c new file mode 100644 index 000000000000..aaa319b932e6 --- /dev/null +++ b/drivers/iio/light/ap3216c.c @@ -0,0 +1,809 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * AP3216C Ambient Light and Infrared Proximity Sensor + * + * Copyright (c) 2019, Robert Eshleman. + * + * Datasheet: https://pdf-datasheet-datasheet.netdna-ssl.com/pdf-down/A/P/3/AP3216C-LITE-ON.pdf + * + * 7-bit I2C slave address 0x1E + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define AP3216C_DRV_NAME "ap3216c" + +/* register addresses */ +#define AP3216C_SYS 0x0 +#define AP3216C_INT_STATUS 0x01 +#define AP3216C_INT_CLR 0x02 +#define AP3216C_IR_DATA_LO 0x0A +#define AP3216C_IR_DATA_HI 0x0B +#define AP3216C_ALS_DATA_LO 0x0C +#define AP3216C_ALS_DATA_HI 0x0D +#define AP3216C_PS_DATA_LO 0x0E +#define AP3216C_PS_DATA_HI 0x0F +#define AP3216C_ALS_CFG 0x10 +#define AP3216C_ALS_CALIB 0x19 +#define AP3216C_ALS_LO_THR_LO 0x1A +#define AP3216C_ALS_LO_THR_HI 0x1B +#define AP3216C_ALS_HI_THR_LO 0x1C +#define AP3216C_ALS_HI_THR_HI 0x1D +#define AP3216C_PS_CFG 0x20 +#define AP3216C_PS_CALIB_LO 0x28 +#define AP3216C_PS_CALIB_HI 0x29 +#define AP3216C_PS_LO_THR_LO 0x2A +#define AP3216C_PS_LO_THR_HI 0x2B +#define AP3216C_PS_HI_THR_LO 0x2C +#define AP3216C_PS_HI_THR_HI 0x2D + +/* SYS_MODE mask and config value */ +#define AP3216C_SYS_MODE_ALS_PS 0x3 + +/* INT_STATUS masks and config value */ +#define AP3216C_INT_STATUS_ALS_MASK BIT(0) +#define AP3216C_INT_STATUS_PS_MASK BIT(1) +#define AP3216C_INT_STATUS_CLR GENMASK(1, 0) +#define AP3216C_INT_ALS_CLR BIT(0) +#define AP3216C_INT_PS_CLR BIT(1) +#define AP3216C_INT_CLR_MANUAL 1 + +/* IR_DATA mask/shift */ +#define AP3216C_IR_DATA_LO_MASK GENMASK(1, 0) +#define AP3216C_IR_DATA_HI_SHIFT 2 + +/* ALS_DATA shift and fractional helper */ +#define AP3216C_ALS_DATA_HI_SHIFT 8 +#define AP3216C_ALS_DATA_DENOM 100000 + +/* ALS_CALIB masks/shifts */ +#define AP3216C_ALS_CALIB_INT_MASK GENMASK(7, 6) +#define AP3216C_ALS_CALIB_INT_SHIFT 6 +#define AP3216C_ALS_CALIB_DEC_MASK GENMASK(5, 0) + +/* PS_DATA shifts/masks/bits */ +#define AP3216C_PS_DATA_LO_MASK GENMASK(3, 0) +#define AP3216C_PS_DATA_LO_IR_OF BIT(6) +#define AP3216C_PS_DATA_HI_MASK GENMASK(5, 0) +#define AP3216C_PS_DATA_HI_SHIFT 4 +#define AP3216C_PS_DATA_HI_IR_OF BIT(6) + +/* ALS_CFG masks */ +#define AP3216C_ALS_CFG_GAIN_MASK GENMASK(5, 4) +#define AP3216C_ALS_CFG_GAIN_SHIFT 4 + +/* ALS_CALIB shifts */ +#define AP3216C_ALS_CALIB_INT_SHIFT 6 + +/* ALS_HI_THR masks and shifts */ +#define AP3216C_ALS_HI_THR_LO_MASK GENMASK(7, 0) +#define AP3216C_ALS_HI_THR_HI_SHIFT 8 +#define AP3216C_ALS_HI_THR_HI_MASK GENMASK(16, 8) +#define AP3216C_ALS_HI_THR_HI_READ_MASK GENMASK(7, 0) +#define AP3216C_ALS_HI_THR_HI_SHIFT 8 + +#define AP3216C_ALS_THR_HI_SHIFT 8 + +/* ALS_LO_THR masks and shifts */ +#define AP3216C_ALS_LO_THR_LO_MASK GENMASK(7, 0) +#define AP3216C_ALS_LO_THR_HI_MASK GENMASK(16, 8) +#define AP3216C_ALS_LO_THR_HI_SHIFT 8 + +/* PS_CFG reg mask/shift/bit values */ +#define AP3216C_PS_CFG_GAIN_MASK GENMASK(3, 2) +#define AP3216C_PS_CFG_GAIN_SHIFT 2 +#define AP3216C_PS_CFG_GAIN(val) \ + (1 << ((val & AP3216C_PS_CFG_GAIN_MASK) >> AP3216C_PS_CFG_GAIN_SHIFT)) + +/* PS_LO and PS_HI multiplier values */ +#define AP3216C_PS_LO_THR_HI_MULT 4 +#define AP3216C_PS_HI_THR_HI_MULT 4 +#define AP3216C_PS_THR_HI_MULT 4 + +/* PS_THR_LO and PS_THR_HI masks/shifts */ +#define AP3216C_PS_THR_LO_MASK GENMASK(1, 0) +#define AP3216C_PS_THR_HI_MASK GENMASK(10, 2) +#define AP3216C_PS_THR_HI_SHIFT 2 + +/* PS_CALIB_HI and PS_CALIB_LO shift/mask/bit values */ +#define AP3216C_PS_CALIB_HI_SHIFT 1 +#define AP3216C_PS_CALIB_HI_MASK GENMASK(8, 1) +#define AP3216C_PS_CALIB_LO_MASK BIT(0) + +/* ALS fractional helper values */ +#define AP3216C_ALS_INTEG_MULT 1000 +#define AP3216C_ALS_FRACT_DIV 100 + +/* ALS_CALIB min/max values (0.0 <= ALS_CALIB <= 3.984375) */ +#define AP3216C_ALS_CALIB_INT_MIN 0 +#define AP3216C_ALS_CALIB_DEC_MIN 0 +#define AP3216C_ALS_CALIB_INT_MAX 3 +#define AP3216C_ALS_CALIB_DEC_MAX 984375 + +/* ALS_CALIB conversion denominator */ +#define AP3216C_ALS_CALIB_DENOM 64 + +#define AP3216C_IIO_MULT 1000000 +#define AP3216C_PS_THR_MAX (BIT(10) - 1) + +/* See ALS configuration ALS_GAIN field in datasheet */ +#define AP3216C_ALS_THR_MAX 20661 + +static const u16 ap3216c_gain_array[] = { + 3500, /* 0.3500 lux resolution */ + 788, /* 0.0788 lux resolution */ + 197, /* 0.0197 lux resolution */ + 49, /* 0.0049 lux resolution */ +}; + +static const u16 ap3216c_als_max_thr_array[] = { + 20661, /* max thr when gain is 0.3500 */ + 5162, /* max thr when gain is 0.0788 */ + 1291, /* max thr when gain is 0.0197 */ + 323, /* max thr when gain is 0.0049*/ +}; + +struct ap3216c_data { + struct regmap *regmap; + struct i2c_client *client; + struct mutex lock; + bool als_thresh_en; + bool prox_thresh_en; +}; + +static const struct iio_event_spec ap3216c_event_spec[] = { + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_RISING, + .mask_separate = BIT(IIO_EV_INFO_VALUE), + }, + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_FALLING, + .mask_separate = BIT(IIO_EV_INFO_VALUE), + }, + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_EITHER, + .mask_shared_by_type = BIT(IIO_EV_INFO_ENABLE), + }, +}; + +static const struct iio_chan_spec ap3216c_channels[] = { + { + .type = IIO_LIGHT, + .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) | + BIT(IIO_CHAN_INFO_CALIBSCALE), + .event_spec = ap3216c_event_spec, + .num_event_specs = ARRAY_SIZE(ap3216c_event_spec), + }, + { + .type = IIO_PROXIMITY, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_CALIBBIAS), + .event_spec = ap3216c_event_spec, + .num_event_specs = ARRAY_SIZE(ap3216c_event_spec), + }, + { + .type = IIO_LIGHT, + .modified = 1, + .channel2 = IIO_MOD_LIGHT_IR, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + } +}; + +static int ap3216c_read_gain(struct ap3216c_data *data, u16 *gain) +{ + unsigned int cfg; + int ret; + + ret = regmap_read(data->regmap, AP3216C_ALS_CFG, &cfg); + if (ret < 0) + return ret; + + *gain = ap3216c_gain_array[(cfg & AP3216C_ALS_CFG_GAIN_MASK) >> + AP3216C_ALS_CFG_GAIN_SHIFT]; + return 0; +} + +static int ap3216c_read_max_thr(struct ap3216c_data *data, u16 *max_thr) +{ + unsigned int cfg; + int ret; + + ret = regmap_read(data->regmap, AP3216C_ALS_CFG, &cfg); + if (ret < 0) + return ret; + + /* max thr is derived from the gain bits of ALS_CFG */ + *max_thr = ap3216c_als_max_thr_array[ + (cfg & AP3216C_ALS_CFG_GAIN_MASK) >> + AP3216C_ALS_CFG_GAIN_SHIFT]; + return 0; +} + +static int ap3216c_write_event_value(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, + int val, int val2) +{ + struct ap3216c_data *data = iio_priv(indio_dev); + u8 vals[2]; + int integral, fractional; + u16 thr, max_thr, gain; + int ret; + + if (val < 0 || val2 < 0) + return -EINVAL; + + switch (chan->type) { + case IIO_LIGHT: + ret = ap3216c_read_max_thr(data, &max_thr); + if (ret < 0) + return ret; + + if (val > max_thr) + val = max_thr; + + ret = ap3216c_read_gain(data, &gain); + if (ret < 0) + return ret; + + integral = val * AP3216C_ALS_INTEG_MULT / gain; + fractional = val2 / AP3216C_ALS_FRACT_DIV / gain; + + thr = integral + fractional; + + switch (dir) { + case IIO_EV_DIR_RISING: + vals[0] = thr & AP3216C_ALS_HI_THR_LO_MASK; + vals[1] = (thr & AP3216C_ALS_HI_THR_HI_MASK) >> + AP3216C_ALS_HI_THR_HI_SHIFT; + + return regmap_bulk_write(data->regmap, + AP3216C_ALS_HI_THR_LO, + vals, 2); + + case IIO_EV_DIR_FALLING: + vals[0] = thr & AP3216C_ALS_LO_THR_LO_MASK; + vals[1] = (thr & AP3216C_ALS_LO_THR_HI_MASK) >> + AP3216C_ALS_LO_THR_HI_SHIFT; + + return regmap_bulk_write(data->regmap, + AP3216C_ALS_LO_THR_LO, + vals, 2); + default: + return -EINVAL; + } + + + case IIO_PROXIMITY: + if (val > AP3216C_PS_THR_MAX) + val = AP3216C_PS_THR_MAX; + + vals[0] = val & AP3216C_PS_THR_LO_MASK; + vals[1] = (val & AP3216C_PS_THR_HI_MASK) >> + AP3216C_PS_THR_HI_SHIFT; + + switch (dir) { + case IIO_EV_DIR_RISING: + return regmap_bulk_write(data->regmap, + AP3216C_PS_HI_THR_LO, + vals, 2); + + case IIO_EV_DIR_FALLING: + return regmap_bulk_write(data->regmap, + AP3216C_PS_LO_THR_LO, + vals, 2); + default: + return -EINVAL; + } + + default: + return -EINVAL; + } +} + +static int ap3216c_get_als_reg(enum iio_event_direction dir) +{ + switch (dir) { + case IIO_EV_DIR_RISING: + return AP3216C_ALS_HI_THR_LO; + + case IIO_EV_DIR_FALLING: + return AP3216C_ALS_LO_THR_LO; + + default: + return -EINVAL; + } +} + +static int ap3216c_get_ps_reg(enum iio_event_direction dir) +{ + switch (dir) { + case IIO_EV_DIR_RISING: + return AP3216C_PS_HI_THR_LO; + + case IIO_EV_DIR_FALLING: + return AP3216C_PS_LO_THR_LO; + + default: + return -EINVAL; + } +} + +static int ap3216c_read_event_value(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, + int *val, int *val2) +{ + struct ap3216c_data *data = iio_priv(indio_dev); + u16 gain; + u8 vals[2]; + int reg, ret; + + switch (chan->type) { + case IIO_LIGHT: + reg = ap3216c_get_als_reg(dir); + if (reg < 0) + return reg; + + ret = regmap_bulk_read(data->regmap, reg, vals, 2); + if (ret < 0) + return ret; + + ret = ap3216c_read_gain(data, &gain); + if (ret < 0) + return ret; + + *val = ((vals[1] << AP3216C_ALS_THR_HI_SHIFT) | vals[0]) * + gain / AP3216C_ALS_INTEG_MULT; + return IIO_VAL_INT; + + case IIO_PROXIMITY: + reg = ap3216c_get_ps_reg(dir); + if (reg < 0) + return reg; + + ret = regmap_bulk_read(data->regmap, reg, vals, 2); + if (ret < 0) + return ret; + + *val = (vals[1] << 2) | (vals[0] & AP3216C_PS_THR_LO_MASK); + + return IIO_VAL_INT; + + default: + return -EINVAL; + } +} + +static int ap3216c_read_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct ap3216c_data *data = iio_priv(indio_dev); + int ret; + + mutex_lock(&data->lock); + switch (chan->type) { + case IIO_LIGHT: + ret = data->als_thresh_en; + break; + + case IIO_PROXIMITY: + ret = data->prox_thresh_en; + break; + + default: + ret = -EINVAL; + break; + } + mutex_unlock(&data->lock); + + return ret; +} + +static int ap3216c_write_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, int state) +{ + struct ap3216c_data *data = iio_priv(indio_dev); + int ret = 0; + + mutex_lock(&data->lock); + switch (chan->type) { + case IIO_LIGHT: + data->als_thresh_en = state; + break; + + case IIO_PROXIMITY: + data->prox_thresh_en = state; + break; + + default: + ret = -EINVAL; + break; + } + mutex_unlock(&data->lock); + + return ret; +} + +static const struct regmap_config ap3216c_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = AP3216C_PS_HI_THR_HI, +}; + +/** + * Returns integral part of decimal between 0.0 and 3.984275 + */ +static int ap3216c_als_calibscale_int(int val) +{ + if (val > AP3216C_ALS_CALIB_INT_MAX) + return AP3216C_ALS_CALIB_INT_MAX; + + if (val <= AP3216C_ALS_CALIB_INT_MIN) + return AP3216C_ALS_CALIB_INT_MIN; + + return val; +} + +/** + * Returns decimal part of decimal number between 0.0 and 3.984275 + */ +static int ap3216c_als_calibscale_dec(int val, int val2) +{ + /* Return max decimal if number exceeds calibscale max */ + if (val > AP3216C_ALS_CALIB_INT_MAX || + (val == AP3216C_ALS_CALIB_INT_MAX && + val2 > AP3216C_ALS_CALIB_DEC_MAX)) + return AP3216C_ALS_CALIB_DEC_MAX; + + /* Floor the decimal if integral below minimum */ + if (val <= AP3216C_ALS_CALIB_INT_MIN) + return AP3216C_ALS_CALIB_DEC_MIN; + + /* Floor the decimal if decimal below minimum */ + if (val2 < AP3216C_ALS_CALIB_DEC_MIN) + return AP3216C_ALS_CALIB_DEC_MIN; + + /* Return max decimal if decimal above maximum */ + if (val2 > AP3216C_ALS_CALIB_DEC_MAX) + return AP3216C_ALS_CALIB_DEC_MAX; + + return val2; +} + +static int ap3216c_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct ap3216c_data *data = iio_priv(indio_dev); + int integral, decimal; + u8 vals[2]; + int tmp; + + switch (mask) { + case IIO_CHAN_INFO_CALIBSCALE: + switch (chan->type) { + case IIO_LIGHT: + integral = ap3216c_als_calibscale_int(val); + decimal = ap3216c_als_calibscale_dec(val, val2); + + tmp = integral << AP3216C_ALS_CALIB_INT_SHIFT; + + /* + * Reverse scaling by multiplying by the scaling + * denominator and dividing by IIO multiplier. + */ + tmp |= (decimal * AP3216C_ALS_CALIB_DENOM) / + AP3216C_IIO_MULT; + + return regmap_write(data->regmap, + AP3216C_ALS_CALIB, tmp); + + default: + return -EINVAL; + } + + case IIO_CHAN_INFO_CALIBBIAS: + switch (chan->type) { + case IIO_PROXIMITY: + vals[0] = val & AP3216C_PS_CALIB_LO_MASK; + vals[1] = (val & AP3216C_PS_CALIB_HI_MASK) >> + AP3216C_PS_CALIB_HI_SHIFT; + + return regmap_bulk_write(data->regmap, + AP3216C_PS_CALIB_LO, + vals, 2); + + default: + return -EINVAL; + } + default: + return -EINVAL; + } +} + +static int ap3216c_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct ap3216c_data *data = iio_priv(indio_dev); + u16 gain; + u8 vals[2]; + int cfg, tmp; + int ret; + + switch (mask) { + case IIO_CHAN_INFO_CALIBSCALE: + switch (chan->type) { + case IIO_LIGHT: + ret = regmap_read(data->regmap, + AP3216C_ALS_CALIB, &tmp); + if (ret < 0) + return ret; + + /* Scale is multiplied by 1/64 */ + *val = tmp; + *val2 = AP3216C_ALS_CALIB_DENOM; + + return IIO_VAL_FRACTIONAL; + + default: + return -EINVAL; + } + + case IIO_CHAN_INFO_CALIBBIAS: + switch (chan->type) { + case IIO_PROXIMITY: + ret = regmap_bulk_read(data->regmap, + AP3216C_PS_CALIB_LO, + vals, 2); + if (ret < 0) + return ret; + + *val = (vals[0] & AP3216C_PS_CALIB_LO_MASK) | + ((vals[1] & AP3216C_PS_CALIB_HI_MASK) << + AP3216C_PS_CALIB_HI_SHIFT); + + return IIO_VAL_INT; + + default: + return -EINVAL; + } + + case IIO_CHAN_INFO_PROCESSED: + switch (chan->type) { + case IIO_LIGHT: + ret = regmap_bulk_read(data->regmap, + AP3216C_ALS_DATA_LO, + vals, 2); + if (ret < 0) + return ret; + + ret = ap3216c_read_gain(data, &gain); + if (ret < 0) + return ret; + + *val = ((vals[1] << AP3216C_ALS_DATA_HI_SHIFT) | + vals[0]) * gain; + *val2 = AP3216C_ALS_DATA_DENOM; + + return IIO_VAL_FRACTIONAL; + + default: + return -EINVAL; + } + + case IIO_CHAN_INFO_RAW: + switch (chan->type) { + case IIO_LIGHT: + if (chan->channel2 != IIO_MOD_LIGHT_IR) + return -EINVAL; + + ret = regmap_bulk_read(data->regmap, + AP3216C_IR_DATA_LO, + vals, 2); + + *val = (vals[0] & AP3216C_IR_DATA_LO_MASK) | + (vals[1] << AP3216C_IR_DATA_HI_SHIFT); + + + return IIO_VAL_INT; + + case IIO_PROXIMITY: + ret = regmap_bulk_read(data->regmap, + AP3216C_PS_DATA_LO, + vals, 2); + if (ret < 0) + return ret; + + ret = regmap_read(data->regmap, + AP3216C_PS_CFG, &cfg); + if (ret < 0) + return ret; + + tmp = vals[0] & AP3216C_PS_DATA_LO_MASK; + tmp |= (vals[1] & AP3216C_PS_DATA_HI_MASK) << + AP3216C_PS_DATA_HI_SHIFT; + *val = tmp * AP3216C_PS_CFG_GAIN(cfg); + + return IIO_VAL_INT; + + default: + return -EINVAL; + } + default: + return -EINVAL; + } +} + +static const struct iio_info ap3216c_info = { + .read_raw = ap3216c_read_raw, + .write_raw = ap3216c_write_raw, + .read_event_value = ap3216c_read_event_value, + .write_event_value = ap3216c_write_event_value, + .read_event_config = ap3216c_read_event_config, + .write_event_config = ap3216c_write_event_config, +}; + +static irqreturn_t ap3216c_event_handler(int irq, void *p) +{ + struct iio_dev *indio_dev = p; + struct ap3216c_data *data = iio_priv(indio_dev); + int status; + s64 timestamp; + int ret; + + mutex_lock(&data->lock); + ret = regmap_read(data->regmap, AP3216C_INT_STATUS, &status); + if (ret) { + dev_err(&data->client->dev, "error reading IRQ status\n"); + goto done; + } + + /* The IRQ was not from this device */ + if (!status) { + mutex_unlock(&data->lock); + return IRQ_NONE; + } + + timestamp = iio_get_time_ns(indio_dev); + if (status & AP3216C_INT_STATUS_PS_MASK) { + if (data->prox_thresh_en) + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(IIO_PROXIMITY, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_EITHER), + timestamp); + + ret = regmap_write(data->regmap, + AP3216C_INT_STATUS, AP3216C_INT_PS_CLR); + if (ret < 0) + dev_err(&data->client->dev, "error clearing PS interrupt\n"); + } + + if (status & AP3216C_INT_STATUS_ALS_MASK) { + if (data->als_thresh_en) + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(IIO_LIGHT, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_EITHER), + timestamp); + + ret = regmap_write(data->regmap, + AP3216C_INT_STATUS, AP3216C_INT_ALS_CLR); + if (ret < 0) + dev_err(&data->client->dev, "error clearing ALS interrupt\n"); + } + +done: + mutex_unlock(&data->lock); + return IRQ_HANDLED; +} + +static int ap3216c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct ap3216c_data *data; + struct iio_dev *indio_dev; + int ret; + + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); + if (!indio_dev) + return -ENOMEM; + + data = iio_priv(indio_dev); + data->client = client; + mutex_init(&data->lock); + indio_dev->dev.parent = &client->dev; + indio_dev->info = &ap3216c_info; + indio_dev->name = AP3216C_DRV_NAME; + indio_dev->channels = ap3216c_channels; + indio_dev->num_channels = ARRAY_SIZE(ap3216c_channels); + + data->regmap = devm_regmap_init_i2c(client, &ap3216c_regmap_config); + if (IS_ERR(data->regmap)) { + dev_err(&client->dev, "Failed to allocate register map\n"); + return PTR_ERR(data->regmap); + } + + /* Default to thresh events disabled */ + data->als_thresh_en = false; + data->prox_thresh_en = false; + + /* + * Require that that the interrupt is cleared only when the INT_STATUS + * register is written to, instead of when data is read. + */ + ret = regmap_write(data->regmap, + AP3216C_INT_CLR, AP3216C_INT_CLR_MANUAL); + if (ret < 0) + return ret; + + ret = regmap_write(data->regmap, AP3216C_INT_STATUS, + AP3216C_INT_PS_CLR | AP3216C_INT_ALS_CLR); + if (ret < 0) { + dev_err(&data->client->dev, "error clearing interrupts\n"); + return ret; + } + + if (client->irq) { + ret = devm_request_threaded_irq(&client->dev, client->irq, + NULL, ap3216c_event_handler, + IRQF_TRIGGER_FALLING | + IRQF_SHARED | IRQF_ONESHOT, + client->name, indio_dev); + if (ret) + return ret; + } + + /* Enable ALS and PS+IR */ + ret = regmap_write(data->regmap, AP3216C_SYS, AP3216C_SYS_MODE_ALS_PS); + if (ret < 0) + return ret; + + return devm_iio_device_register(&client->dev, indio_dev); +} + +static const struct of_device_id ap3216c_of_match[] = { + { .compatible = "liteon,ap3216c", }, + { }, +}; +MODULE_DEVICE_TABLE(of, ap3216c_of_match); + +static const struct i2c_device_id ap3216c_id[] = { + {"ap3216c", 0}, + { } +}; +MODULE_DEVICE_TABLE(i2c, ap3216c_id); + +static struct i2c_driver ap3216c_driver = { + .driver = { + .name = AP3216C_DRV_NAME, + }, + .probe = ap3216c_probe, + .id_table = ap3216c_id, +}; +module_i2c_driver(ap3216c_driver); + +MODULE_AUTHOR("Robert Eshleman "); +MODULE_DESCRIPTION("AP3216C Ambient Light and Proximity Sensor"); +MODULE_LICENSE("GPL v2"); From patchwork Sun Feb 24 20:33:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bobby Eshleman X-Patchwork-Id: 10828051 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 278EA1575 for ; Sun, 24 Feb 2019 20:33:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1656C2AB4C for ; Sun, 24 Feb 2019 20:33:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A6162ABDF; Sun, 24 Feb 2019 20:33:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA8302AB4C for ; Sun, 24 Feb 2019 20:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728407AbfBXUdp (ORCPT ); Sun, 24 Feb 2019 15:33:45 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:38186 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726458AbfBXUdo (ORCPT ); Sun, 24 Feb 2019 15:33:44 -0500 Received: by mail-pl1-f196.google.com with SMTP id g37so661404plb.5; Sun, 24 Feb 2019 12:33:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KnnxHwkDJFIYf3W9dWpRpBGaF42LRM0p/MCcNDxRd+E=; b=G5E238wTz3ko9ARX0FzIuZ6Dsv++poSBZhwhSAmots9FzBMCadcMTkXg/EECFdy/GO ME3ukX40PkccPuhu2wV8+ywJCboaCmP9aedkIKMcvI7G7rN/MuHun/6XJyHwuzoDSrS/ sWyGkHG87ezV8C1eYwyd9q3jnhJZu7sCy1H1M7s4jpzdfx1JPoLJeDjBkj9U9Wrr3dYy yHzgSJyx1H3a4WTRDtVgp+L2NrI09Y1w/zSIg1dSaWYGNTYCJAjdNOiAgIQBCxPFsb2/ nV01+WXuwdmNNEvSN9hCw41iMKq09vdVKOavYX/nZZVu8a3qgpoEki/9Z5wm4Un0NV3q 7cYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KnnxHwkDJFIYf3W9dWpRpBGaF42LRM0p/MCcNDxRd+E=; b=THyGsN4ABEX3/23ixAEvC2dhnVKvfJR3+Ci3TveV2voOthTykcZmeWx13/m2/Y+n01 Moxu6wQWqGcPyZkrUlSCjM6yomxZWDQVj2mgweI8qEuwlyPufwOerB3RIRQVNHBFZYoY ooWydM0r7tpVtQ7fTDPt1ZSBtTePJ4aohrD3qpfvoAO8cQPO9BzH1S+vQ0Q0tCMFT6t+ gXmJbjiXWKQ0zMxFqP+DJWpdZVV7/MjcRMRNhJqEugLk7qFG6bti/+WjkOfci6dz63ih sBokKMLeOMIZH9CE3tyG0vQw+JNEIsKDSK+bLgZPdgN5nfTflvS0F37nuIEy2SK6ijsv NwKg== X-Gm-Message-State: AHQUAuYQf22gkO+PRJ7GKD652zEv8f0pCGHgezn8+lWM39nEEwCDIhVB C7DDqs+g0zIgP0SHXhWJtiY= X-Google-Smtp-Source: AHgI3IYSkoMu8iFfOkRNLemNOJK67HMqduXj7Rfo35bEb2b0RKjUosTyhviihirW38li95+BENJx2Q== X-Received: by 2002:a17:902:7688:: with SMTP id m8mr15054553pll.248.1551040423865; Sun, 24 Feb 2019 12:33:43 -0800 (PST) Received: from bobby.hsd1.or.comcast.net ([2601:1c0:5501:37e2::e774]) by smtp.googlemail.com with ESMTPSA id 70sm24105423pfr.43.2019.02.24.12.33.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Feb 2019 12:33:43 -0800 (PST) From: Robert Eshleman To: bobbyeshleman@gmail.com Cc: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Mark Rutland , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] dt-bindings: iio: light: Add ap3216c Date: Sun, 24 Feb 2019 12:33:51 -0800 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: <42dbbd7568e4216a320c6fd617bd91c1ee045af0.1551037168.git.bobbyeshleman@gmail.com> References: <42dbbd7568e4216a320c6fd617bd91c1ee045af0.1551037168.git.bobbyeshleman@gmail.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adds device tree bindings for the ap3216c ambient light and proximity sensor. Signed-off-by: Robert Eshleman Reviewed-by: Rob Herring --- .../devicetree/bindings/iio/light/ap3216c.txt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/light/ap3216c.txt diff --git a/Documentation/devicetree/bindings/iio/light/ap3216c.txt b/Documentation/devicetree/bindings/iio/light/ap3216c.txt new file mode 100644 index 000000000000..c5ae80c79dd8 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/light/ap3216c.txt @@ -0,0 +1,22 @@ +* AP3216C Ambient Light and Proximity Sensor + +Required properties: + - compatible: should be "liteon,ap3216c" + - reg: the I2C address of the sensor (default is <0x1e>) + +Optional properties: + - interrupts: interrupt mapping for GPIO IRQ. Should be configured with + IRQ_TYPE_EDGE_FALLING. + +Refer to interrupt-controller/interrupts.txt for generic interrupt client +node bindings. + +Example: + +light-sensor@1e { + compatible = "liteon,ap3216c"; + reg = <0x1e>; + + interrupt-parent = <&gpio1>; + interrupts = <17 IRQ_TYPE_EDGE_FALLING>; +};