2020-07-27 14:49:36

by Christian Eggers

[permalink] [raw]
Subject: [PATCH] iio: light: Support AMS AS73211 digital XYZ sensor

This series adds support for the AMS AS73211 digital XYZ sensor.



2020-07-27 14:50:33

by Christian Eggers

[permalink] [raw]
Subject: [PATCH 1/2] dt-bindings: iio: light: add AMS AS73211 support

Add DT bindings for AMS AS73211 XYZ True Color Sensor.

Signed-off-by: Christian Eggers <[email protected]>
---
.../bindings/iio/light/ams,as73211.yaml | 54 +++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 Documentation/devicetree/bindings/iio/light/ams,as73211.yaml

diff --git a/Documentation/devicetree/bindings/iio/light/ams,as73211.yaml b/Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
new file mode 100644
index 000000000000..25808123a434
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
@@ -0,0 +1,54 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/iio/light/as73211.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: AMS AS73211 JENCOLOR(R) Digital XYZ Sensor
+
+maintainers:
+ - Christian Eggers <[email protected]>
+
+description: |
+ XYZ True Color Sensor with I2C Interface
+ https://ams.com/documents/20143/36005/AS73211_DS000556_3-01.pdf/a65474c0-b302-c2fd-e30a-c98df87616df
+
+properties:
+ compatible:
+ enum:
+ - ams,as73211
+
+ reg:
+ description:
+ I2C address of the device (0x74).
+ maxItems: 1
+
+ interrupts:
+ description:
+ Interrupt specifier for the READY interrupt generated by the device.
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ i2c {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ as73211@74 {
+ compatible = "ams,as73211";
+ reg = <0x74>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_color_sensor>;
+ interrupt-parent = <&gpio2>;
+ interrupts = <19 IRQ_TYPE_EDGE_RISING>; /* READY */
+ };
+ };
+...
--
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

2020-07-27 14:51:21

by Christian Eggers

[permalink] [raw]
Subject: [PATCH 2/2] iio: light: as73211: New driver

Support for AMS AS73211 JENCOLOR(R) Digital XYZ Sensor.

This driver has no built-in trigger. In order for making triggered
measurements, an external (software) trigger driver like
iio-trig-hrtimer or iio-trig-sysfs is required.

The sensor supports single and continuous measurement modes. The latter
is not used by design as this would require tight timing synchronization
between hardware and driver without much benefit.

Signed-off-by: Christian Eggers <[email protected]>
---
MAINTAINERS | 7 +
drivers/iio/light/Kconfig | 15 +
drivers/iio/light/Makefile | 1 +
drivers/iio/light/as73211.c | 822 ++++++++++++++++++++++++++++++++++++
4 files changed, 845 insertions(+)
create mode 100644 drivers/iio/light/as73211.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 068d6e94122b..673570414147 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -934,6 +934,13 @@ S: Supported
F: arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
F: drivers/net/ethernet/amd/xgbe/

+AMS AS73211 DRIVER
+M: Christian Eggers <[email protected]>
+L: [email protected]
+S: Maintained
+F: Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
+F: drivers/iio/light/as73211.c
+
ANALOG DEVICES INC AD5686 DRIVER
M: Michael Hennerich <[email protected]>
L: [email protected]
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 182bd18c4bb2..cade6dc0305b 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -86,6 +86,21 @@ config APDS9960
To compile this driver as a module, choose M here: the
module will be called apds9960

+config AS73211
+ tristate "AMS AS73211 XYZ color sensor"
+ depends on I2C
+ select IIO_BUFFER
+ select IIO_TRIGGERED_BUFFER
+ help
+ If you say yes here you get support for the AMS AS73211
+ JENCOLOR(R) Digital XYZ Sensor.
+
+ For triggered measurements, you will need an additional trigger driver
+ like IIO_HRTIMER_TRIGGER or IIO_SYSFS_TRIGGER.
+
+ This driver can also be built as a module. If so, the module
+ will be called as73211.
+
config BH1750
tristate "ROHM BH1750 ambient light sensor"
depends on I2C
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index d1c8aa30b9a8..ea376deaca54 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_AL3010) += al3010.o
obj-$(CONFIG_AL3320A) += al3320a.o
obj-$(CONFIG_APDS9300) += apds9300.o
obj-$(CONFIG_APDS9960) += apds9960.o
+obj-$(CONFIG_AS73211) += as73211.o
obj-$(CONFIG_BH1750) += bh1750.o
obj-$(CONFIG_BH1780) += bh1780.o
obj-$(CONFIG_CM32181) += cm32181.o
diff --git a/drivers/iio/light/as73211.c b/drivers/iio/light/as73211.c
new file mode 100644
index 000000000000..93f392f1bea1
--- /dev/null
+++ b/drivers/iio/light/as73211.c
@@ -0,0 +1,822 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * as73211.c - Support for AMS AS73211 JENCOLOR(R) Digital XYZ Sensor
+ *
+ * Author: Christian Eggers <[email protected]>
+ *
+ * Copyright (c) 2020 ARRI Lighting
+ *
+ * Color light sensor with 16-bit channels for red, green, blue, clear);
+ * 7-bit I2C slave address 0x74 .. 0x77.
+ *
+ * Datasheet: https://ams.com/documents/20143/36005/AS73211_DS000556_3-01.pdf/a65474c0-b302-c2fd-e30a-c98df87616df
+ *
+ */
+
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/pm.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/triggered_buffer.h>
+#include <linux/iio/trigger.h>
+
+#define AS73211_DRV_NAME "as73211"
+
+/* AS73211 configuration registers */
+#define AS73211_REG_OSR 0x0
+#define AS73211_REG_AGEN 0x2
+#define AS73211_REG_CREG1 0x6
+#define AS73211_REG_CREG2 0x7
+#define AS73211_REG_CREG3 0x8
+
+/* AS73211 output register bank */
+#define AS73211_OUT_OSR_STATUS 0
+#define AS73211_OUT_TEMP 1
+#define AS73211_OUT_MRES1 2
+#define AS73211_OUT_MRES2 3
+#define AS73211_OUT_MRES3 4
+
+/* OSR */
+#define AS73211_OSR_SS BIT(7)
+#define AS73211_OSR_PD BIT(6)
+#define AS73211_OSR_SW_RES BIT(3)
+#define AS73211_OSR_DOS_SHIFT 0
+#define AS73211_OSR_DOS_MASK (0x7 << AS73211_OSR_DOS_SHIFT)
+#define AS73211_OSR_DOS_CONFIG (0x2 << AS73211_OSR_DOS_SHIFT)
+#define AS73211_OSR_DOS_MEASURE (0x3 << AS73211_OSR_DOS_SHIFT)
+
+/* AGEN */
+#define AS73211_AGEN_DEVID_SHIFT 4
+#define AS73211_AGEN_DEVID_MASK (0xf << AS73211_AGEN_DEVID_SHIFT)
+
+/* CREG1 */
+#define AS73211_CREG1_GAIN_SHIFT 4
+#define AS73211_CREG1_GAIN_MASK (0xf << AS73211_CREG1_GAIN_SHIFT)
+#define AS73211_CREG1_TIME_SHIFT 0
+#define AS73211_CREG1_TIME_MASK (0xf << AS73211_CREG1_TIME_SHIFT)
+
+/* CREG3 */
+#define AS73211_CREG3_CCLK_SHIFT 0
+#define AS73211_CREG3_CCLK_MASK (0x3 << AS73211_CREG3_CCLK_SHIFT)
+
+/* OSR_STATUS */
+#define AS73211_OSR_STATUS_OUTCONVOF BIT(15)
+#define AS73211_OSR_STATUS_MRESOF BIT(14)
+#define AS73211_OSR_STATUS_ADCOF BIT(13)
+#define AS73211_OSR_STATUS_LDATA BIT(12)
+#define AS73211_OSR_STATUS_NDATA BIT(11)
+#define AS73211_OSR_STATUS_NOTREADY BIT(10)
+
+
+/**
+ * struct as73211_data - Instance data for one AS73211
+ * @client: I2C client.
+ * @osr: Cached Operational State Register.
+ * @creg1: Cached Configuration Register 1.
+ * @creg2: Cached Configuration Register 2.
+ * @creg3: Cached Configuration Register 3.
+ * @buffer: Buffer for triggered measurements.
+ * @mutex: Device mutex. N.B: We do not use iio_dev::mlock because we need to
+ * change device properties while in buffered mode.
+ * @completion: Completion to wait for interrupt.
+ */
+struct as73211_data {
+ struct i2c_client *client;
+ u8 osr;
+ u8 creg1;
+ u8 creg2;
+ u8 creg3;
+ u16 buffer[8]; /* 4 16-bit channels + 64-bit timestamp */
+ struct mutex mutex;
+ struct completion completion;
+};
+
+#define AS73211_COLOR_CHANNEL(_color, _si, _addr) { \
+ .type = IIO_INTENSITY, \
+ .modified = 1, \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), \
+ .info_mask_shared_by_type = \
+ BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
+ BIT(IIO_CHAN_INFO_HARDWAREGAIN) | \
+ BIT(IIO_CHAN_INFO_INT_TIME), \
+ .channel2 = IIO_MOD_##_color, \
+ .address = _addr, \
+ .scan_index = _si, \
+ .scan_type = { \
+ .sign = 'u', \
+ .realbits = 16, \
+ .storagebits = 16, \
+ .endianness = IIO_CPU, \
+ }, \
+}
+
+#define AS73211_TEMP_CHANNEL(_si, _addr) { \
+ .type = IIO_TEMP, \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ .channel2 = 0, \
+ .address = _addr, \
+ .scan_index = _si, \
+ .scan_type = { \
+ .sign = 'u', \
+ .realbits = 16, \
+ .storagebits = 16, \
+ .endianness = IIO_CPU, \
+ }, \
+}
+
+#define AS73211_SCALE_X 277071108 /* nW/m^2 */
+#define AS73211_SCALE_Y 298384270 /* nW/m^2 */
+#define AS73211_SCALE_Z 160241927 /* nW/m^2 */
+
+/* Channel order MUST match devices result register order */
+static const struct iio_chan_spec as73211_channels[] = {
+ AS73211_TEMP_CHANNEL(0, AS73211_OUT_TEMP),
+ AS73211_COLOR_CHANNEL(X, 1, AS73211_OUT_MRES1),
+ AS73211_COLOR_CHANNEL(Y, 2, AS73211_OUT_MRES2),
+ AS73211_COLOR_CHANNEL(Z, 3, AS73211_OUT_MRES3),
+ IIO_CHAN_SOFT_TIMESTAMP(4),
+};
+
+static unsigned int as73211_integration_time_cycles(struct as73211_data *data)
+{
+ return 1 << (data->creg1 & AS73211_CREG1_TIME_MASK);
+}
+
+/* return current integration time (in us) */
+static unsigned int as73211_integration_time_us(struct as73211_data *data)
+{
+ /* Integration time has 15 steps, the step size depends on the clock. */
+ unsigned int mul = 1 << (3 - (data->creg3 & 0b11)); /* 8 = 1.024 MHz, 4 = 2.048 MHz ...*/
+ unsigned int time_cycles = as73211_integration_time_cycles(data);
+ unsigned int time_us = time_cycles * 125 * mul;
+
+ return time_us;
+}
+
+/* return gain (1, 2, 4, 8, ...) */
+static unsigned int as73211_gain(struct as73211_data *data)
+{
+ return 1 << (0b1011 - (data->creg1 >> AS73211_CREG1_GAIN_SHIFT));
+}
+
+/* must be called with as73211_data::mutex held. */
+static int as73211_req_data(struct as73211_data *data)
+{
+ unsigned int time_us = as73211_integration_time_us(data), ret;
+ union i2c_smbus_data smbus_data;
+ s32 osr_status;
+
+ if (data->client->irq)
+ init_completion(&data->completion);
+
+ /* During measurement, there should be no traffic on the i2c bus */
+ i2c_lock_bus(data->client->adapter, I2C_LOCK_SEGMENT);
+
+ data->osr &= ~AS73211_OSR_DOS_MASK;
+ data->osr |= AS73211_OSR_DOS_MEASURE | AS73211_OSR_SS;
+
+ smbus_data.byte = data->osr;
+ ret = __i2c_smbus_xfer(data->client->adapter, data->client->addr,
+ data->client->flags, I2C_SMBUS_WRITE,
+ AS73211_REG_OSR, I2C_SMBUS_BYTE_DATA, &smbus_data);
+ if (ret) {
+ i2c_unlock_bus(data->client->adapter, I2C_LOCK_SEGMENT);
+ return ret;
+ }
+
+ /* Reset AS73211_OSR_SS (is self clearing) in order to avoid unintentional
+ * triggering of further measurements later.
+ */
+ data->osr &= ~AS73211_OSR_SS;
+
+ /* Add some extra margin for the timeout. sensor timing is not as precise
+ * as our one ...
+ */
+ time_us += time_us / 8;
+ if (data->client->irq) {
+ dev_dbg(&data->client->dev, "%s(): Waiting for completion...\n", __func__);
+ ret = wait_for_completion_timeout(&data->completion,
+ 2 + usecs_to_jiffies(time_us));
+ if (!ret) {
+ dev_err(&data->client->dev,
+ "timeout waiting for READY IRQ\n");
+ i2c_unlock_bus(data->client->adapter, I2C_LOCK_SEGMENT);
+ return -ETIMEDOUT;
+ }
+ } else {
+ /* Wait integration time */
+ dev_dbg(&data->client->dev, "%s(): Sleeping %d us\n", __func__, time_us);
+ usleep_range(time_us, time_us + 100000);
+ }
+
+ i2c_unlock_bus(data->client->adapter, I2C_LOCK_SEGMENT);
+
+ osr_status = i2c_smbus_read_word_data(data->client, AS73211_OUT_OSR_STATUS);
+ if (osr_status < 0) {
+ ret = osr_status;
+ return ret;
+ }
+
+ dev_dbg(&data->client->dev, "%s: osr_status = 0x%04x\n", __func__, osr_status);
+ if (osr_status != (AS73211_OSR_DOS_MEASURE | AS73211_OSR_STATUS_NDATA)) {
+ if (osr_status & AS73211_OSR_SS) {
+ dev_warn(&data->client->dev, "%s() Measurement has not stopped\n",
+ __func__);
+ return -ETIME;
+ }
+ if (osr_status & AS73211_OSR_STATUS_NOTREADY) {
+ dev_warn(&data->client->dev, "%s() Data is not ready\n", __func__);
+ return -ENODATA;
+ }
+ if (!(osr_status & AS73211_OSR_STATUS_NDATA)) {
+ dev_warn(&data->client->dev, "%s() New new data available\n", __func__);
+ return -ENODATA;
+ }
+ if (osr_status & AS73211_OSR_STATUS_LDATA) {
+ dev_warn(&data->client->dev, "%s() Result buffer overrun\n", __func__);
+ return -ENOBUFS;
+ }
+ if (osr_status & AS73211_OSR_STATUS_ADCOF) {
+ dev_warn(&data->client->dev, "%s() ADC overflow\n", __func__);
+ return -EOVERFLOW;
+ }
+ if (osr_status & AS73211_OSR_STATUS_MRESOF) {
+ dev_warn(&data->client->dev, "%s() Measurement result overflow\n",
+ __func__);
+ return -EOVERFLOW;
+ }
+ if (osr_status & AS73211_OSR_STATUS_OUTCONVOF) {
+ dev_warn(&data->client->dev, "%s() Timer overflow\n", __func__);
+ return -EOVERFLOW;
+ }
+ dev_warn(&data->client->dev, "%s() Unexpected status value\n", __func__);
+ return -EIO;
+ }
+
+ return 0;
+}
+
+static int as73211_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2, long mask)
+{
+ struct as73211_data *data = iio_priv(indio_dev);
+
+ switch (mask) {
+ case IIO_CHAN_INFO_RAW:
+ {
+ int ret = iio_device_claim_direct_mode(indio_dev);
+
+ if (ret)
+ return ret;
+ ret = as73211_req_data(data);
+ if (ret < 0) {
+ iio_device_release_direct_mode(indio_dev);
+ return ret;
+ }
+ ret = i2c_smbus_read_word_data(data->client, chan->address);
+ iio_device_release_direct_mode(indio_dev);
+ if (ret < 0)
+ return ret;
+ *val = ret;
+ return IIO_VAL_INT;
+ }
+ case IIO_CHAN_INFO_SCALE:
+ {
+ unsigned int scale;
+
+ switch (chan->channel2) {
+ case IIO_MOD_X:
+ scale = AS73211_SCALE_X;
+ break;
+ case IIO_MOD_Y:
+ scale = AS73211_SCALE_Y;
+ break;
+ case IIO_MOD_Z:
+ scale = AS73211_SCALE_Z;
+ break;
+ default:
+ return -EINVAL;
+ }
+ scale /= as73211_gain(data);
+ scale /= as73211_integration_time_cycles(data);
+ *val = scale;
+ return IIO_VAL_INT;
+ }
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ *val = (1 << (data->creg3 & 0b11)) * 1024 * 1000;
+ return IIO_VAL_INT;
+ case IIO_CHAN_INFO_HARDWAREGAIN:
+ *val = as73211_gain(data);
+ return IIO_VAL_INT;
+ case IIO_CHAN_INFO_INT_TIME:
+ {
+ unsigned int time_us;
+
+ mutex_lock(&data->mutex);
+ time_us = as73211_integration_time_us(data);
+ mutex_unlock(&data->mutex);
+ *val = time_us / 1000000;
+ *val2 = time_us % 1000000;
+ return IIO_VAL_INT_PLUS_MICRO;
+ }
+ } // switch (mask)
+
+ return -EINVAL;
+}
+
+static int _as73211_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan __always_unused,
+ int val, int val2, long mask)
+{
+ struct as73211_data *data = iio_priv(indio_dev);
+
+ switch (mask) {
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ {
+ int reg_bits, freq_kHz = val / 1000; /* 1024, 2048, ... */
+
+ if (val < 0 || (freq_kHz * 1000) != val || val2)
+ return -EINVAL;
+ if (!is_power_of_2(freq_kHz))
+ return -EINVAL;
+ reg_bits = ilog2(freq_kHz) - 10;
+ if (reg_bits & ~AS73211_CREG3_CCLK_MASK)
+ return -EINVAL;
+
+ data->creg3 &= ~AS73211_CREG3_CCLK_MASK;
+ data->creg3 |= reg_bits;
+ return i2c_smbus_write_byte_data(
+ data->client, AS73211_REG_CREG3,
+ data->creg3);
+ }
+ case IIO_CHAN_INFO_HARDWAREGAIN:
+ {
+ int reg_bits;
+
+ if (val < 0 || !is_power_of_2(val) || val2)
+ return -EINVAL;
+ reg_bits = (0b1011 - ilog2(val)) << AS73211_CREG1_GAIN_SHIFT;
+ if (reg_bits != (reg_bits & AS73211_CREG1_GAIN_MASK))
+ return -EINVAL;
+ data->creg1 &= ~AS73211_CREG1_GAIN_MASK;
+ data->creg1 |= reg_bits;
+
+ return i2c_smbus_write_byte_data(
+ data->client, AS73211_REG_CREG1,
+ data->creg1);
+ }
+ case IIO_CHAN_INFO_INT_TIME:
+ {
+ int time_us = val * 1000000 + val2, time_ms;
+ int reg_bits;
+
+ /* Integration time has 15 steps, the step size depends on the clock.
+ * 1 = 1.024 MHz, 2 = 2.048 MHz ..
+ */
+ int mul = 1 << (data->creg3 & AS73211_CREG3_CCLK_MASK);
+
+ time_ms = (time_us * mul) / 1000; /* 1 ms, 2 ms, ... (power of two) */
+ if (time_ms < 0 || !is_power_of_2(time_ms) || time_ms > 16384)
+ return -EINVAL;
+ reg_bits = ilog2(time_ms) << AS73211_CREG1_TIME_SHIFT;
+ data->creg1 &= ~AS73211_CREG1_TIME_MASK;
+ data->creg1 |= reg_bits;
+
+ return i2c_smbus_write_byte_data(
+ data->client, AS73211_REG_CREG1,
+ data->creg1);
+ }
+ } // switch (mask)
+ return -EINVAL;
+}
+
+static int as73211_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val, int val2, long mask)
+{
+ int ret;
+ struct as73211_data *data = iio_priv(indio_dev);
+
+ /* Need to switch to config mode ... */
+ mutex_lock(&data->mutex);
+
+ if ((data->osr & AS73211_OSR_DOS_MASK) != AS73211_OSR_DOS_CONFIG) {
+ data->osr &= ~AS73211_OSR_DOS_MASK;
+ data->osr |= AS73211_OSR_DOS_CONFIG;
+
+ dev_dbg(&indio_dev->dev, "%s(): Switching to configuration state...", __func__);
+ ret = i2c_smbus_write_byte_data(
+ data->client, AS73211_REG_OSR,
+ data->osr);
+ if (ret)
+ goto error_release;
+ }
+
+ ret = _as73211_write_raw(indio_dev, chan, val, val2, mask);
+
+error_release:
+ mutex_unlock(&data->mutex);
+ return ret;
+}
+
+static irqreturn_t as73211_ready_handler(int irq __always_unused, void *priv)
+{
+ struct iio_dev *indio_dev = priv;
+ struct as73211_data *data = iio_priv(indio_dev);
+
+ complete(&data->completion);
+
+ return IRQ_HANDLED;
+}
+
+static irqreturn_t as73211_trigger_handler(int irq __always_unused, void *p)
+{
+ struct iio_poll_func *pf = p;
+ struct iio_dev *indio_dev = pf->indio_dev;
+ struct as73211_data *data = iio_priv(indio_dev);
+ int data_result, ret;
+
+ mutex_lock(&data->mutex);
+
+ data_result = as73211_req_data(data);
+
+ /* Optimization for reading all (color + temperature) channels */
+ if (*indio_dev->active_scan_mask == 0xf) {
+ u8 addr = as73211_channels[0].address;
+ struct i2c_msg msgs[] = {
+ {
+ .addr = data->client->addr,
+ .flags = 0,
+ .len = 1,
+ .buf = &addr
+ },
+ {
+ .addr = data->client->addr,
+ .flags = I2C_M_RD,
+ .len = 4 * sizeof(*data->buffer),
+ .buf = (u8 *)&data->buffer[0]
+ },
+ };
+ ret = i2c_transfer(data->client->adapter, msgs, ARRAY_SIZE(msgs));
+ if (ret < 0)
+ goto done;
+
+ /* Temperature channel is not affected by overflows */
+ data->buffer[0] = le16_to_cpu(data->buffer[0]);
+
+ if (data_result == 0) {
+ /* convert byte order (AS73211 sends LSB first) */
+ data->buffer[1] = le16_to_cpu(data->buffer[1]);
+ data->buffer[2] = le16_to_cpu(data->buffer[2]);
+ data->buffer[3] = le16_to_cpu(data->buffer[3]);
+ } else {
+ /* saturate all channels (useful for overflows) */
+ data->buffer[1] = 0xffff;
+ data->buffer[2] = 0xffff;
+ data->buffer[3] = 0xffff;
+ }
+
+ }
+ /* Optimization for reading all color channels */
+ else if (*indio_dev->active_scan_mask == 0xe) {
+ /* AS73211 starts reading at address 2 */
+ ret = i2c_master_recv(data->client,
+ (char *)&data->buffer[1], 3 * sizeof(*data->buffer));
+ if (ret < 0)
+ goto done;
+
+ if (data_result == 0) {
+ /* convert byte order (as73211 sends LSB first) */
+ data->buffer[1] = le16_to_cpu(data->buffer[1]);
+ data->buffer[2] = le16_to_cpu(data->buffer[2]);
+ data->buffer[3] = le16_to_cpu(data->buffer[3]);
+ } else {
+ /* saturate all channels (useful for overflows) */
+ data->buffer[1] = 0xffff;
+ data->buffer[2] = 0xffff;
+ data->buffer[3] = 0xffff;
+ }
+ } else {
+ unsigned int i, j = 0;
+
+ /* generic case */
+ for_each_set_bit(i, indio_dev->active_scan_mask, indio_dev->masklength) {
+ struct iio_chan_spec const *channel = &as73211_channels[i];
+
+ /* Read data even on error in order to avoid "result buffer overrun" */
+ ret = i2c_smbus_read_word_data(data->client,
+ channel->address);
+ if (ret < 0)
+ goto done;
+
+ if (data_result == 0) {
+ data->buffer[j++] = ret;
+ } else {
+ /* saturate all channels (useful for overflows) */
+ data->buffer[j++] = 0xffff;
+ }
+ }
+ }
+
+ iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
+ iio_get_time_ns(indio_dev));
+
+done:
+ mutex_unlock(&data->mutex);
+ iio_trigger_notify_done(indio_dev->trig);
+
+ return IRQ_HANDLED;
+}
+
+static ssize_t as73211_show_samp_freq_available(
+ struct device *dev __always_unused,
+ struct device_attribute *attr __always_unused,
+ char *buf)
+{
+ size_t len = 0;
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
+ (1 << (i + 10)) * 1000);
+ }
+
+ /* replace trailing space by newline */
+ buf[len - 1] = '\n';
+
+ return len;
+}
+
+static ssize_t as73211_show_int_time_available(struct device *dev,
+ struct device_attribute *attr __always_unused,
+ char *buf)
+{
+ struct as73211_data *data = iio_priv(i2c_get_clientdata(
+ to_i2c_client(dev)));
+ size_t len = 0;
+ int i;
+
+ /* Integration time has 15 steps, the step size depends on the clock. */
+ int mul = 1 << (3 - (data->creg3 & 0b11)); /* 8 = 1.024 MHz, 4 = 2.048 MHz ...*/
+
+ for (i = 0; i < 15; i++) {
+ int time_us = mul * (1 << i) * 125;
+
+ len += scnprintf(buf + len, PAGE_SIZE - len, "%d.%06d ",
+ time_us / 1000000,
+ time_us % 1000000);
+ }
+
+ /* replace trailing space by newline */
+ buf[len - 1] = '\n';
+
+ return len;
+}
+
+static ssize_t as73211_show_hardwaregain_available(
+ struct device *dev __always_unused,
+ struct device_attribute *attr __always_unused,
+ char *buf)
+{
+ size_t len = 0;
+ int i;
+
+ for (i = 0; i < 12; i++) {
+ len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
+ 1 << i);
+ }
+
+ /* replace trailing space by newline */
+ buf[len - 1] = '\n';
+
+ return len;
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(as73211_show_samp_freq_available);
+static IIO_DEV_ATTR_INT_TIME_AVAIL(as73211_show_int_time_available);
+static IIO_DEVICE_ATTR(hardwaregain_available, S_IRUGO,
+ as73211_show_hardwaregain_available, NULL, 0);
+static IIO_CONST_ATTR_TEMP_OFFSET("-66.9");
+static IIO_CONST_ATTR_TEMP_SCALE("0.05");
+
+static struct attribute *as73211_attributes[] = {
+ &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
+ &iio_dev_attr_integration_time_available.dev_attr.attr,
+ &iio_dev_attr_hardwaregain_available.dev_attr.attr,
+ &iio_const_attr_in_temp_offset.dev_attr.attr,
+ &iio_const_attr_in_temp_scale.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group as73211_attribute_group = {
+ .attrs = as73211_attributes,
+};
+
+static const struct iio_info as73211_info = {
+ .read_raw = as73211_read_raw,
+ .write_raw = as73211_write_raw,
+ .attrs = &as73211_attribute_group,
+};
+
+static int as73211_probe(struct i2c_client *client,
+ struct i2c_device_id const *id __always_unused)
+{
+ struct as73211_data *data;
+ struct iio_dev *indio_dev;
+ int ret;
+
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+ if (indio_dev == NULL)
+ return -ENOMEM;
+
+ data = iio_priv(indio_dev);
+ i2c_set_clientdata(client, indio_dev);
+ data->client = client;
+
+ mutex_init(&data->mutex);
+
+ indio_dev->dev.parent = &client->dev;
+ indio_dev->info = &as73211_info;
+ indio_dev->name = AS73211_DRV_NAME;
+ indio_dev->channels = as73211_channels;
+ indio_dev->num_channels = ARRAY_SIZE(as73211_channels);
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ ret = i2c_smbus_read_byte_data(data->client, AS73211_REG_OSR);
+ if (ret < 0)
+ return ret;
+ data->osr = ret;
+
+ /* reset device */
+ data->osr |= AS73211_OSR_SW_RES;
+ ret = i2c_smbus_write_byte_data(data->client, AS73211_REG_OSR,
+ data->osr);
+ if (ret < 0)
+ return ret;
+
+ ret = i2c_smbus_read_byte_data(data->client, AS73211_REG_OSR);
+ if (ret < 0)
+ return ret;
+ data->osr = ret;
+
+ /* Reading AGEN is only possible after reset (AGEN is not available if
+ * device is in measurement mode).
+ */
+ ret = i2c_smbus_read_byte_data(data->client, AS73211_REG_AGEN);
+ if (ret < 0)
+ return ret;
+
+ if ((ret >> AS73211_AGEN_DEVID_SHIFT) == 0b0010)
+ dev_info(&client->dev, "AS73211 found\n");
+ else
+ return -ENODEV;
+
+ ret = i2c_smbus_read_byte_data(data->client, AS73211_REG_CREG1);
+ if (ret < 0)
+ return ret;
+ data->creg1 = ret;
+
+ ret = i2c_smbus_read_byte_data(data->client, AS73211_REG_CREG2);
+ if (ret < 0)
+ return ret;
+ data->creg2 = ret;
+
+ ret = i2c_smbus_read_byte_data(data->client, AS73211_REG_CREG3);
+ if (ret < 0)
+ return ret;
+ data->creg3 = ret;
+
+ /* enable device */
+ data->osr &= ~AS73211_OSR_PD;
+ ret = i2c_smbus_write_byte_data(data->client, AS73211_REG_OSR,
+ data->osr);
+ if (ret < 0)
+ return ret;
+
+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
+ as73211_trigger_handler, NULL);
+ if (ret < 0)
+ return ret;
+
+ if (client->irq) {
+ ret = request_threaded_irq(client->irq,
+ NULL,
+ as73211_ready_handler,
+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+ client->name, indio_dev);
+ if (ret)
+ goto buffer_cleanup;
+ }
+
+ ret = iio_device_register(indio_dev);
+ if (ret < 0)
+ goto free_irq;
+
+ return 0;
+
+free_irq:
+ if (client->irq)
+ free_irq(client->irq, indio_dev);
+buffer_cleanup:
+ iio_triggered_buffer_cleanup(indio_dev);
+ return ret;
+}
+
+static int as73211_powerdown(struct iio_dev *indio_dev)
+{
+ struct as73211_data *data = iio_priv(indio_dev);
+ int ret;
+
+ mutex_lock(&data->mutex);
+
+ data->osr |= AS73211_OSR_PD;
+ ret = i2c_smbus_write_byte_data(data->client, AS73211_REG_OSR,
+ data->osr);
+
+ mutex_unlock(&data->mutex);
+
+ return ret;
+}
+
+static int as73211_remove(struct i2c_client *client)
+{
+ struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+ iio_device_unregister(indio_dev);
+ if (client->irq)
+ free_irq(client->irq, indio_dev);
+ iio_triggered_buffer_cleanup(indio_dev);
+ as73211_powerdown(indio_dev);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int as73211_suspend(struct device *dev)
+{
+ struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+
+ return as73211_powerdown(indio_dev);
+}
+
+static int as73211_resume(struct device *dev)
+{
+ struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+ struct as73211_data *data = iio_priv(indio_dev);
+ int ret;
+
+ mutex_lock(&data->mutex);
+
+ data->osr &= ~AS73211_OSR_PD;
+ ret = i2c_smbus_write_byte_data(data->client, AS73211_REG_OSR,
+ data->osr);
+
+ mutex_unlock(&data->mutex);
+
+ return ret;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(as73211_pm_ops, as73211_suspend, as73211_resume);
+
+#ifdef CONFIG_OF
+static const struct of_device_id as73211_of_match[] = {
+ {
+ .compatible = "ams,as73211",
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, as73211_of_match);
+#else
+#define as73211_of_match NULL
+#endif
+
+static const struct i2c_device_id as73211_id[] = {
+ { "as73211", 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, as73211_id);
+
+static struct i2c_driver as73211_driver = {
+ .driver = {
+ .name = AS73211_DRV_NAME,
+ .of_match_table = of_match_ptr(as73211_of_match),
+ .pm = &as73211_pm_ops,
+ },
+ .probe = as73211_probe,
+ .remove = as73211_remove,
+ .id_table = as73211_id,
+};
+module_i2c_driver(as73211_driver);
+
+MODULE_AUTHOR("Christian Eggers <[email protected]>");
+MODULE_DESCRIPTION("AS73211 XYZ True Color Sensor driver");
+MODULE_LICENSE("GPL");
--
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

2020-07-27 19:13:25

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH 1/2] dt-bindings: iio: light: add AMS AS73211 support

On Mon, 27 Jul 2020 16:47:40 +0200, Christian Eggers wrote:
> Add DT bindings for AMS AS73211 XYZ True Color Sensor.
>
> Signed-off-by: Christian Eggers <[email protected]>
> ---
> .../bindings/iio/light/ams,as73211.yaml | 54 +++++++++++++++++++
> 1 file changed, 54 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
>


My bot found errors running 'make dt_binding_check' on your patch:

Documentation/devicetree/bindings/iio/light/ams,as73211.yaml: $id: relative path/filename doesn't match actual path or filename
expected: http://devicetree.org/schemas/iio/light/ams,as73211.yaml#


See https://patchwork.ozlabs.org/patch/1337022

If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure dt-schema is up to date:

pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade

Please check and re-submit.

2020-07-28 04:49:24

by kernel test robot

[permalink] [raw]
Subject: Re: [PATCH 2/2] iio: light: as73211: New driver

Hi Christian,

I love your patch! Perhaps something to improve:

[auto build test WARNING on iio/togreg]
[also build test WARNING on robh/for-next linux/master linus/master v5.8-rc7 next-20200727]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url: https://github.com/0day-ci/linux/commits/Christian-Eggers/dt-bindings-iio-light-add-AMS-AS73211-support/20200727-234842
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
config: sparc64-randconfig-s031-20200728 (attached as .config)
compiler: sparc64-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.2-94-geb6779f6-dirty
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=sparc64

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>


sparse warnings: (new ones prefixed by >>)

>> drivers/iio/light/as73211.c:473:35: sparse: sparse: cast to restricted __le16
>> drivers/iio/light/as73211.c:473:35: sparse: sparse: cast to restricted __le16
>> drivers/iio/light/as73211.c:473:35: sparse: sparse: cast to restricted __le16
>> drivers/iio/light/as73211.c:473:35: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:477:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:477:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:477:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:477:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:478:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:478:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:478:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:478:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:479:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:479:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:479:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:479:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:498:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:498:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:498:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:498:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:499:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:499:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:499:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:499:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:500:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:500:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:500:43: sparse: sparse: cast to restricted __le16
drivers/iio/light/as73211.c:500:43: sparse: sparse: cast to restricted __le16

vim +473 drivers/iio/light/as73211.c

439
440 static irqreturn_t as73211_trigger_handler(int irq __always_unused, void *p)
441 {
442 struct iio_poll_func *pf = p;
443 struct iio_dev *indio_dev = pf->indio_dev;
444 struct as73211_data *data = iio_priv(indio_dev);
445 int data_result, ret;
446
447 mutex_lock(&data->mutex);
448
449 data_result = as73211_req_data(data);
450
451 /* Optimization for reading all (color + temperature) channels */
452 if (*indio_dev->active_scan_mask == 0xf) {
453 u8 addr = as73211_channels[0].address;
454 struct i2c_msg msgs[] = {
455 {
456 .addr = data->client->addr,
457 .flags = 0,
458 .len = 1,
459 .buf = &addr
460 },
461 {
462 .addr = data->client->addr,
463 .flags = I2C_M_RD,
464 .len = 4 * sizeof(*data->buffer),
465 .buf = (u8 *)&data->buffer[0]
466 },
467 };
468 ret = i2c_transfer(data->client->adapter, msgs, ARRAY_SIZE(msgs));
469 if (ret < 0)
470 goto done;
471
472 /* Temperature channel is not affected by overflows */
> 473 data->buffer[0] = le16_to_cpu(data->buffer[0]);
474
475 if (data_result == 0) {
476 /* convert byte order (AS73211 sends LSB first) */
477 data->buffer[1] = le16_to_cpu(data->buffer[1]);
478 data->buffer[2] = le16_to_cpu(data->buffer[2]);
479 data->buffer[3] = le16_to_cpu(data->buffer[3]);
480 } else {
481 /* saturate all channels (useful for overflows) */
482 data->buffer[1] = 0xffff;
483 data->buffer[2] = 0xffff;
484 data->buffer[3] = 0xffff;
485 }
486
487 }
488 /* Optimization for reading all color channels */
489 else if (*indio_dev->active_scan_mask == 0xe) {
490 /* AS73211 starts reading at address 2 */
491 ret = i2c_master_recv(data->client,
492 (char *)&data->buffer[1], 3 * sizeof(*data->buffer));
493 if (ret < 0)
494 goto done;
495
496 if (data_result == 0) {
497 /* convert byte order (as73211 sends LSB first) */
498 data->buffer[1] = le16_to_cpu(data->buffer[1]);
499 data->buffer[2] = le16_to_cpu(data->buffer[2]);
500 data->buffer[3] = le16_to_cpu(data->buffer[3]);
501 } else {
502 /* saturate all channels (useful for overflows) */
503 data->buffer[1] = 0xffff;
504 data->buffer[2] = 0xffff;
505 data->buffer[3] = 0xffff;
506 }
507 } else {
508 unsigned int i, j = 0;
509
510 /* generic case */
511 for_each_set_bit(i, indio_dev->active_scan_mask, indio_dev->masklength) {
512 struct iio_chan_spec const *channel = &as73211_channels[i];
513
514 /* Read data even on error in order to avoid "result buffer overrun" */
515 ret = i2c_smbus_read_word_data(data->client,
516 channel->address);
517 if (ret < 0)
518 goto done;
519
520 if (data_result == 0) {
521 data->buffer[j++] = ret;
522 } else {
523 /* saturate all channels (useful for overflows) */
524 data->buffer[j++] = 0xffff;
525 }
526 }
527 }
528
529 iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
530 iio_get_time_ns(indio_dev));
531
532 done:
533 mutex_unlock(&data->mutex);
534 iio_trigger_notify_done(indio_dev->trig);
535
536 return IRQ_HANDLED;
537 }
538

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]


Attachments:
(No filename) (7.09 kB)
.config.gz (25.87 kB)
Download all attachments