* [PATCH] Add support for the Domintech DMARD09 3-axis accelerometer @ 2016-07-16 19:51 Jelle van der Waa 2016-07-16 19:51 ` [PATCH] iio: accel: add " Jelle van der Waa 2016-07-18 20:54 ` [PATCH v2] " Jelle van der Waa 0 siblings, 2 replies; 11+ messages in thread From: Jelle van der Waa @ 2016-07-16 19:51 UTC (permalink / raw) To: linux-iio, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler Cc: Jelle van der Waa This patch adds basic read_raw support for the DMARD09 3-axis accelerometer which can be found in a q8 A33 Allwinner tablet. [0] The driver is based on the Android driver which can be found on Github. [1] Unfortunately there is no datatsheet of the DMARD09 available online. [0] http://linux-sunxi.org/TZX-723Qa4 [1] https://github.com/JujuXIII/android_kernel_acer_v370_KK/tree/master/mediatek/custom/common/kernel/accelerometer/dmard09 Jelle van der Waa (1): iio: accel: add support for the Domintech DMARD09 3-axis accelerometer .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ drivers/iio/accel/Kconfig | 10 ++ drivers/iio/accel/Makefile | 1 + drivers/iio/accel/dmard09.c | 180 +++++++++++++++++++++ 4 files changed, 204 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt create mode 100644 drivers/iio/accel/dmard09.c -- 2.9.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-16 19:51 [PATCH] Add support for the Domintech DMARD09 3-axis accelerometer Jelle van der Waa @ 2016-07-16 19:51 ` Jelle van der Waa 2016-07-17 16:12 ` Peter Meerwald-Stadler ` (2 more replies) 2016-07-18 20:54 ` [PATCH v2] " Jelle van der Waa 1 sibling, 3 replies; 11+ messages in thread From: Jelle van der Waa @ 2016-07-16 19:51 UTC (permalink / raw) To: linux-iio, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler Cc: Jelle van der Waa Minimal implementation of an IIO driver for the Domintech DMARD09 3-axis accelerometer. Only supports reading the x,y,z axes at the moment. Implementation based on the Android driver from the Acer Liquid E2 kernel sources. Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> --- .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ drivers/iio/accel/Kconfig | 10 ++ drivers/iio/accel/Makefile | 1 + drivers/iio/accel/dmard09.c | 180 +++++++++++++++++++++ 4 files changed, 204 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt create mode 100644 drivers/iio/accel/dmard09.c diff --git a/Documentation/devicetree/bindings/iio/accel/dmard09.txt b/Documentation/devicetree/bindings/iio/accel/dmard09.txt new file mode 100644 index 0000000..69b2a03 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/accel/dmard09.txt @@ -0,0 +1,13 @@ +Domintech DMARD09 accelerometer devicetree bindings + +Required properties: + + - compatible : should be "domintech,dmard09" + - reg : the I2C address of the sensor + +Example: + +dmard09@0x1d { + compatible = "domintech,dmard09"; + reg = <0x1d>; +}; diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index e4a758c..3fb16eb 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -40,6 +40,16 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config DMARD09 + tristate "Domintech DMARD09 3-axis Accelerometer Driver" + select I2C + help + Say yes here to get support for the Domintech DMARD09 3-axis + accelerometer. + + Choosing M will build the driver as a module. If so, the module + will be called dmard09. + config HID_SENSOR_ACCEL_3D depends on HID_SENSOR_HUB select IIO_BUFFER diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 71b6794..b1022a0 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_BMA180) += bma180.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_DMARD09) += dmard09.o obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o obj-$(CONFIG_KXSD9) += kxsd9.o diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c new file mode 100644 index 0000000..8689c5a --- /dev/null +++ b/drivers/iio/accel/dmard09.c @@ -0,0 +1,180 @@ +/* + * 3-axis accelerometer driver for DMARD09 3-axis sensor. + * + * Copyright (c) 2016, Jelle van der Waa <jelle@vdwaa.nl> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include <linux/module.h> +#include <linux/i2c.h> +#include <linux/iio/iio.h> + +#define DMARD09_DRV_NAME "dmard09" + +#define DMARD09_REG_CHIPID 0x18 +#define DMARD09_REG_STAT 0x0A +#define DMARD09_REG_X 0x0C +#define DMARD09_REG_Y 0x0E +#define DMARD09_REG_Z 0x10 +#define DMARD09_CHIPID 0x95 + +#define DMARD09_BUF_LEN 8 +#define DMARD09_AXES_NUM 3 +#define DMARD09_AXIS_X 0 +#define DMARD09_AXIS_Y 1 +#define DMARD09_AXIS_Z 2 + +/* Used for dev_info() */ +struct dmard09_data { + struct i2c_client *client; + struct device *dev; +}; + +static const struct iio_chan_spec dmard09_channels[] = { + { + .type = IIO_ACCEL, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), + .modified = 1, + .address = DMARD09_REG_X, + .channel2 = IIO_MOD_X, + }, + { + .type = IIO_ACCEL, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), + .modified = 1, + .address = DMARD09_REG_Y, + .channel2 = IIO_MOD_Y, + }, + { + .type = IIO_ACCEL, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), + .modified = 1, + .address = DMARD09_REG_Z, + .channel2 = IIO_MOD_Z, + } +}; + +static int dmard09_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct dmard09_data *data = iio_priv(indio_dev); + u8 buf[DMARD09_BUF_LEN] = {0}; + int ret; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + ret = i2c_smbus_read_i2c_block_data(data->client, + DMARD09_REG_STAT, + DMARD09_BUF_LEN, buf); + if (ret < 0) { + dev_err(data->dev, "Error reading reg %lu\n", + chan->address); + return ret; + } + + if (chan->address == DMARD09_REG_X) + *val = (s16)((buf[(DMARD09_AXIS_X+1)*2+1] << 8) + | (buf[(DMARD09_AXIS_X+1)*2])); + if (chan->address == DMARD09_REG_Y) + *val = (s16)((buf[(DMARD09_AXIS_Y+1)*2+1] << 8) + | (buf[(DMARD09_AXIS_Y+1)*2])); + if (chan->address == DMARD09_REG_Z) + *val = (s16)((buf[(DMARD09_AXIS_Z+1)*2+1] << 8) + | (buf[(DMARD09_AXIS_Z+1)*2])); + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static const struct iio_info dmard09_info = { + .driver_module = THIS_MODULE, + .read_raw = dmard09_read_raw, +}; + +static int dmard09_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + int ret; + struct iio_dev *indio_dev; + struct dmard09_data *data; + + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); + if (!indio_dev) { + dev_err(&client->dev, "iio allocation failed\n"); + return -ENOMEM; + } + + data = iio_priv(indio_dev); + data->dev = &client->dev; + data->client = client; + + ret = i2c_smbus_read_byte_data(data->client, DMARD09_REG_CHIPID); + if (ret < 0) { + dev_err(&client->dev, "Error reading chip id %d\n", ret); + return ret; + } + + if (ret != DMARD09_CHIPID) { + dev_err(&client->dev, "Invalid chip id %d\n", ret); + return -ENODEV; + } + + i2c_set_clientdata(client, indio_dev); + indio_dev->dev.parent = &client->dev; + indio_dev->name = DMARD09_DRV_NAME; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = dmard09_channels; + indio_dev->num_channels = DMARD09_AXES_NUM; + indio_dev->info = &dmard09_info; + + ret = iio_device_register(indio_dev); + if (ret < 0) + return ret; + + return 0; +} + +static int dmard09_remove(struct i2c_client *client) +{ + struct iio_dev *indio_dev = i2c_get_clientdata(client); + + iio_device_unregister(indio_dev); + + return 0; +} + +static const struct i2c_device_id dmard09_id[] = { + { "dmard09", 0}, + { }, +}; + +MODULE_DEVICE_TABLE(i2c, dmard09_id); + +static struct i2c_driver dmard09_driver = { + .driver = { + .name = DMARD09_DRV_NAME + }, + .probe = dmard09_probe, + .remove = dmard09_remove, + .id_table = dmard09_id, +}; + +module_i2c_driver(dmard09_driver); + +MODULE_AUTHOR("Jelle van der Waa <jelle@vdwaa.nl>"); +MODULE_DESCRIPTION("DMARD09 3-axis accelerometer driver"); +MODULE_LICENSE("GPL"); -- 2.9.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-16 19:51 ` [PATCH] iio: accel: add " Jelle van der Waa @ 2016-07-17 16:12 ` Peter Meerwald-Stadler 2016-07-18 11:54 ` Lars-Peter Clausen 2016-07-18 17:01 ` Jonathan Cameron 2 siblings, 0 replies; 11+ messages in thread From: Peter Meerwald-Stadler @ 2016-07-17 16:12 UTC (permalink / raw) To: Jelle van der Waa Cc: linux-iio, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen > Minimal implementation of an IIO driver for the Domintech DMARD09 3-axis > accelerometer. Only supports reading the x,y,z axes at the moment. comments below > Implementation based on the Android driver from the Acer Liquid E2 > kernel sources. > > Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> > --- > .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ > drivers/iio/accel/Kconfig | 10 ++ > drivers/iio/accel/Makefile | 1 + > drivers/iio/accel/dmard09.c | 180 +++++++++++++++++++++ > 4 files changed, 204 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt > create mode 100644 drivers/iio/accel/dmard09.c > > diff --git a/Documentation/devicetree/bindings/iio/accel/dmard09.txt b/Documentation/devicetree/bindings/iio/accel/dmard09.txt > new file mode 100644 > index 0000000..69b2a03 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/accel/dmard09.txt > @@ -0,0 +1,13 @@ > +Domintech DMARD09 accelerometer devicetree bindings > + > +Required properties: > + > + - compatible : should be "domintech,dmard09" > + - reg : the I2C address of the sensor > + > +Example: > + > +dmard09@0x1d { > + compatible = "domintech,dmard09"; > + reg = <0x1d>; > +}; > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig > index e4a758c..3fb16eb 100644 > --- a/drivers/iio/accel/Kconfig > +++ b/drivers/iio/accel/Kconfig > @@ -40,6 +40,16 @@ config BMC150_ACCEL_SPI > tristate > select REGMAP_SPI > > +config DMARD09 > + tristate "Domintech DMARD09 3-axis Accelerometer Driver" > + select I2C > + help > + Say yes here to get support for the Domintech DMARD09 3-axis > + accelerometer. > + > + Choosing M will build the driver as a module. If so, the module > + will be called dmard09. > + > config HID_SENSOR_ACCEL_3D > depends on HID_SENSOR_HUB > select IIO_BUFFER > diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile > index 71b6794..b1022a0 100644 > --- a/drivers/iio/accel/Makefile > +++ b/drivers/iio/accel/Makefile > @@ -7,6 +7,7 @@ obj-$(CONFIG_BMA180) += bma180.o > obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o > obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o > obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o > +obj-$(CONFIG_DMARD09) += dmard09.o > obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o > obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o > obj-$(CONFIG_KXSD9) += kxsd9.o > diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c > new file mode 100644 > index 0000000..8689c5a > --- /dev/null > +++ b/drivers/iio/accel/dmard09.c > @@ -0,0 +1,180 @@ > +/* > + * 3-axis accelerometer driver for DMARD09 3-axis sensor. remove extra space at beginning of line 3-axis mentioned twice > + * > + * Copyright (c) 2016, Jelle van der Waa <jelle@vdwaa.nl> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include <linux/module.h> > +#include <linux/i2c.h> > +#include <linux/iio/iio.h> > + > +#define DMARD09_DRV_NAME "dmard09" > + > +#define DMARD09_REG_CHIPID 0x18 > +#define DMARD09_REG_STAT 0x0A > +#define DMARD09_REG_X 0x0C > +#define DMARD09_REG_Y 0x0E > +#define DMARD09_REG_Z 0x10 > +#define DMARD09_CHIPID 0x95 > + > +#define DMARD09_BUF_LEN 8 > +#define DMARD09_AXES_NUM 3 > +#define DMARD09_AXIS_X 0 > +#define DMARD09_AXIS_Y 1 > +#define DMARD09_AXIS_Z 2 > + > +/* Used for dev_info() */ > +struct dmard09_data { > + struct i2c_client *client; > + struct device *dev; what is this good for? use client->dev? > +}; > + > +static const struct iio_chan_spec dmard09_channels[] = { a #define would help to write this in a more concise way > + { > + .type = IIO_ACCEL, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > + .modified = 1, > + .address = DMARD09_REG_X, I suggest to store _AXIS_N here or rather AXIS_N_OFFSET which would be (AXIS+1)*2 > + .channel2 = IIO_MOD_X, > + }, > + { > + .type = IIO_ACCEL, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > + .modified = 1, > + .address = DMARD09_REG_Y, > + .channel2 = IIO_MOD_Y, > + }, > + { > + .type = IIO_ACCEL, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > + .modified = 1, > + .address = DMARD09_REG_Z, > + .channel2 = IIO_MOD_Z, > + } > +}; > + > +static int dmard09_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long mask) > +{ > + struct dmard09_data *data = iio_priv(indio_dev); > + u8 buf[DMARD09_BUF_LEN] = {0}; why initialize buf? > + int ret; > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + ret = i2c_smbus_read_i2c_block_data(data->client, > + DMARD09_REG_STAT, > + DMARD09_BUF_LEN, buf); > + if (ret < 0) { a comment explaining the read stragegy would be nice I guess that _STAT would have some information if the data is ready/valid? why not start reading at AXIS_X? > + dev_err(data->dev, "Error reading reg %lu\n", > + chan->address); > + return ret; > + } > + check stat? the if block is not necessary, maybe *val = (s16) le16_to_cpup(&buf[chan->address]) where chan->address is the offset into buf > + if (chan->address == DMARD09_REG_X) > + *val = (s16)((buf[(DMARD09_AXIS_X+1)*2+1] << 8) > + | (buf[(DMARD09_AXIS_X+1)*2])); > + if (chan->address == DMARD09_REG_Y) > + *val = (s16)((buf[(DMARD09_AXIS_Y+1)*2+1] << 8) > + | (buf[(DMARD09_AXIS_Y+1)*2])); > + if (chan->address == DMARD09_REG_Z) > + *val = (s16)((buf[(DMARD09_AXIS_Z+1)*2+1] << 8) > + | (buf[(DMARD09_AXIS_Z+1)*2])); > + > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > +} > + > +static const struct iio_info dmard09_info = { > + .driver_module = THIS_MODULE, > + .read_raw = dmard09_read_raw, > +}; > + > +static int dmard09_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + int ret; > + struct iio_dev *indio_dev; > + struct dmard09_data *data; > + > + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > + if (!indio_dev) { > + dev_err(&client->dev, "iio allocation failed\n"); > + return -ENOMEM; > + } > + > + data = iio_priv(indio_dev); > + data->dev = &client->dev; > + data->client = client; > + > + ret = i2c_smbus_read_byte_data(data->client, DMARD09_REG_CHIPID); > + if (ret < 0) { > + dev_err(&client->dev, "Error reading chip id %d\n", ret); > + return ret; > + } > + > + if (ret != DMARD09_CHIPID) { > + dev_err(&client->dev, "Invalid chip id %d\n", ret); > + return -ENODEV; > + } > + > + i2c_set_clientdata(client, indio_dev); > + indio_dev->dev.parent = &client->dev; > + indio_dev->name = DMARD09_DRV_NAME; > + indio_dev->modes = INDIO_DIRECT_MODE; > + indio_dev->channels = dmard09_channels; > + indio_dev->num_channels = DMARD09_AXES_NUM; I suggest ARRAY_SIZE(dmard09_channels) > + indio_dev->info = &dmard09_info; > + > + ret = iio_device_register(indio_dev); could use devm_iio_device_register, just return devm_iio_device_register(...) and drop the if > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int dmard09_remove(struct i2c_client *client) > +{ > + struct iio_dev *indio_dev = i2c_get_clientdata(client); > + > + iio_device_unregister(indio_dev); > + > + return 0; > +} > + > +static const struct i2c_device_id dmard09_id[] = { > + { "dmard09", 0}, > + { }, > +}; > + > +MODULE_DEVICE_TABLE(i2c, dmard09_id); > + > +static struct i2c_driver dmard09_driver = { > + .driver = { > + .name = DMARD09_DRV_NAME > + }, > + .probe = dmard09_probe, > + .remove = dmard09_remove, > + .id_table = dmard09_id, > +}; > + > +module_i2c_driver(dmard09_driver); > + > +MODULE_AUTHOR("Jelle van der Waa <jelle@vdwaa.nl>"); > +MODULE_DESCRIPTION("DMARD09 3-axis accelerometer driver"); > +MODULE_LICENSE("GPL"); > -- Peter Meerwald-Stadler +43-664-2444418 (mobile) ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-16 19:51 ` [PATCH] iio: accel: add " Jelle van der Waa 2016-07-17 16:12 ` Peter Meerwald-Stadler @ 2016-07-18 11:54 ` Lars-Peter Clausen 2016-07-18 17:01 ` Jonathan Cameron 2 siblings, 0 replies; 11+ messages in thread From: Lars-Peter Clausen @ 2016-07-18 11:54 UTC (permalink / raw) To: Jelle van der Waa, linux-iio, Jonathan Cameron, Hartmut Knaack, Peter Meerwald-Stadler On 07/16/2016 09:51 PM, Jelle van der Waa wrote: > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig > index e4a758c..3fb16eb 100644 > --- a/drivers/iio/accel/Kconfig > +++ b/drivers/iio/accel/Kconfig > @@ -40,6 +40,16 @@ config BMC150_ACCEL_SPI > tristate > select REGMAP_SPI > > +config DMARD09 > + tristate "Domintech DMARD09 3-axis Accelerometer Driver" > + select I2C This should be 'depends on I2C'. I2C is a feature that can be enabled/disabled and only when enabled drivers which use I2C should be available. > + help > + Say yes here to get support for the Domintech DMARD09 3-axis > + accelerometer. > + > + Choosing M will build the driver as a module. If so, the module > + will be called dmard09. > + ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-16 19:51 ` [PATCH] iio: accel: add " Jelle van der Waa 2016-07-17 16:12 ` Peter Meerwald-Stadler 2016-07-18 11:54 ` Lars-Peter Clausen @ 2016-07-18 17:01 ` Jonathan Cameron 2 siblings, 0 replies; 11+ messages in thread From: Jonathan Cameron @ 2016-07-18 17:01 UTC (permalink / raw) To: Jelle van der Waa, linux-iio, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler On 16/07/16 20:51, Jelle van der Waa wrote: > Minimal implementation of an IIO driver for the Domintech DMARD09 3-axis > accelerometer. Only supports reading the x,y,z axes at the moment. > > Implementation based on the Android driver from the Acer Liquid E2 > kernel sources. > > Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> Nice little driver. A few comments inline. Thanks, Jonathan > --- > .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ > drivers/iio/accel/Kconfig | 10 ++ > drivers/iio/accel/Makefile | 1 + > drivers/iio/accel/dmard09.c | 180 +++++++++++++++++++++ > 4 files changed, 204 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt > create mode 100644 drivers/iio/accel/dmard09.c > > diff --git a/Documentation/devicetree/bindings/iio/accel/dmard09.txt b/Documentation/devicetree/bindings/iio/accel/dmard09.txt > new file mode 100644 > index 0000000..69b2a03 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/accel/dmard09.txt > @@ -0,0 +1,13 @@ > +Domintech DMARD09 accelerometer devicetree bindings Could go in the i2c/trivial-devices.txt list. > + > +Required properties: > + > + - compatible : should be "domintech,dmard09" > + - reg : the I2C address of the sensor > + > +Example: > + > +dmard09@0x1d { > + compatible = "domintech,dmard09"; domintech needs adding to devicetree/bindings/vendor-prefixes.txt > + reg = <0x1d>; > +}; > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig > index e4a758c..3fb16eb 100644 > --- a/drivers/iio/accel/Kconfig > +++ b/drivers/iio/accel/Kconfig > @@ -40,6 +40,16 @@ config BMC150_ACCEL_SPI > tristate > select REGMAP_SPI > > +config DMARD09 > + tristate "Domintech DMARD09 3-axis Accelerometer Driver" > + select I2C > + help > + Say yes here to get support for the Domintech DMARD09 3-axis > + accelerometer. > + > + Choosing M will build the driver as a module. If so, the module > + will be called dmard09. > + > config HID_SENSOR_ACCEL_3D > depends on HID_SENSOR_HUB > select IIO_BUFFER > diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile > index 71b6794..b1022a0 100644 > --- a/drivers/iio/accel/Makefile > +++ b/drivers/iio/accel/Makefile > @@ -7,6 +7,7 @@ obj-$(CONFIG_BMA180) += bma180.o > obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o > obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o > obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o > +obj-$(CONFIG_DMARD09) += dmard09.o > obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o > obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o > obj-$(CONFIG_KXSD9) += kxsd9.o > diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c > new file mode 100644 > index 0000000..8689c5a > --- /dev/null > +++ b/drivers/iio/accel/dmard09.c > @@ -0,0 +1,180 @@ > +/* > + * 3-axis accelerometer driver for DMARD09 3-axis sensor. > + * > + * Copyright (c) 2016, Jelle van der Waa <jelle@vdwaa.nl> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include <linux/module.h> > +#include <linux/i2c.h> > +#include <linux/iio/iio.h> > + > +#define DMARD09_DRV_NAME "dmard09" > + > +#define DMARD09_REG_CHIPID 0x18 > +#define DMARD09_REG_STAT 0x0A > +#define DMARD09_REG_X 0x0C > +#define DMARD09_REG_Y 0x0E > +#define DMARD09_REG_Z 0x10 > +#define DMARD09_CHIPID 0x95 > + > +#define DMARD09_BUF_LEN 8 > +#define DMARD09_AXES_NUM 3 > +#define DMARD09_AXIS_X 0 > +#define DMARD09_AXIS_Y 1 > +#define DMARD09_AXIS_Z 2 > + > +/* Used for dev_info() */ > +struct dmard09_data { > + struct i2c_client *client; > + struct device *dev; Given you can get this from client->dev, don't bother keeping a copy of this as well. > +}; > + > +static const struct iio_chan_spec dmard09_channels[] = { > + { > + .type = IIO_ACCEL, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > + .modified = 1, > + .address = DMARD09_REG_X, > + .channel2 = IIO_MOD_X, > + }, > + { > + .type = IIO_ACCEL, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > + .modified = 1, > + .address = DMARD09_REG_Y, > + .channel2 = IIO_MOD_Y, > + }, > + { > + .type = IIO_ACCEL, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), > + .modified = 1, > + .address = DMARD09_REG_Z, > + .channel2 = IIO_MOD_Z, > + } > +}; > + > +static int dmard09_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long mask) > +{ > + struct dmard09_data *data = iio_priv(indio_dev); > + u8 buf[DMARD09_BUF_LEN] = {0}; I doubt you need the init... Should be filled by the read. > + int ret; > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + ret = i2c_smbus_read_i2c_block_data(data->client, > + DMARD09_REG_STAT, Why start at reg_stat? Does it look like it's clearing a hold on the data for example? > + DMARD09_BUF_LEN, buf); > + if (ret < 0) { > + dev_err(data->dev, "Error reading reg %lu\n", > + chan->address); > + return ret; > + } > + > + if (chan->address == DMARD09_REG_X) Please put spaces around the + and * as per kernel style.. Also these look to be doing endian conversions (or might be depending on which endian we are). As such, it would be better to use the relevant of be16tocpu or le16tocpu (I'm dozing off in an airport so will leave it up to you to figure out which ;) That makes it basically free for one case. > + *val = (s16)((buf[(DMARD09_AXIS_X+1)*2+1] << 8) > + | (buf[(DMARD09_AXIS_X+1)*2])); > + if (chan->address == DMARD09_REG_Y) > + *val = (s16)((buf[(DMARD09_AXIS_Y+1)*2+1] << 8) > + | (buf[(DMARD09_AXIS_Y+1)*2])); > + if (chan->address == DMARD09_REG_Z) > + *val = (s16)((buf[(DMARD09_AXIS_Z+1)*2+1] << 8) > + | (buf[(DMARD09_AXIS_Z+1)*2])); > + > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > +} > + > +static const struct iio_info dmard09_info = { > + .driver_module = THIS_MODULE, > + .read_raw = dmard09_read_raw, > +}; > + > +static int dmard09_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + int ret; > + struct iio_dev *indio_dev; > + struct dmard09_data *data; > + > + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > + if (!indio_dev) { > + dev_err(&client->dev, "iio allocation failed\n"); > + return -ENOMEM; > + } > + > + data = iio_priv(indio_dev); > + data->dev = &client->dev; > + data->client = client; > + > + ret = i2c_smbus_read_byte_data(data->client, DMARD09_REG_CHIPID); > + if (ret < 0) { > + dev_err(&client->dev, "Error reading chip id %d\n", ret); > + return ret; > + } > + > + if (ret != DMARD09_CHIPID) { > + dev_err(&client->dev, "Invalid chip id %d\n", ret); > + return -ENODEV; > + } > + > + i2c_set_clientdata(client, indio_dev); > + indio_dev->dev.parent = &client->dev; > + indio_dev->name = DMARD09_DRV_NAME; > + indio_dev->modes = INDIO_DIRECT_MODE; > + indio_dev->channels = dmard09_channels; > + indio_dev->num_channels = DMARD09_AXES_NUM; > + indio_dev->info = &dmard09_info; > + > + ret = iio_device_register(indio_dev); > + if (ret < 0) > + return ret; > + > + return 0; > +} > + > +static int dmard09_remove(struct i2c_client *client) > +{ > + struct iio_dev *indio_dev = i2c_get_clientdata(client); > + > + iio_device_unregister(indio_dev); As there is nothing else to be done in remove, you should be fine to use devm_iio_device_register in probe and drop the remove entirely, leaving the managed devm stuff to deal with the unregister. > + > + return 0; > +} > + > +static const struct i2c_device_id dmard09_id[] = { > + { "dmard09", 0}, > + { }, > +}; > + > +MODULE_DEVICE_TABLE(i2c, dmard09_id); > + > +static struct i2c_driver dmard09_driver = { > + .driver = { > + .name = DMARD09_DRV_NAME > + }, > + .probe = dmard09_probe, > + .remove = dmard09_remove, > + .id_table = dmard09_id, > +}; > + > +module_i2c_driver(dmard09_driver); > + > +MODULE_AUTHOR("Jelle van der Waa <jelle@vdwaa.nl>"); > +MODULE_DESCRIPTION("DMARD09 3-axis accelerometer driver"); > +MODULE_LICENSE("GPL"); > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-16 19:51 [PATCH] Add support for the Domintech DMARD09 3-axis accelerometer Jelle van der Waa 2016-07-16 19:51 ` [PATCH] iio: accel: add " Jelle van der Waa @ 2016-07-18 20:54 ` Jelle van der Waa 2016-07-18 20:54 ` [PATCH] " Jelle van der Waa 2016-07-24 13:25 ` [PATCH v2] " Jonathan Cameron 1 sibling, 2 replies; 11+ messages in thread From: Jelle van der Waa @ 2016-07-18 20:54 UTC (permalink / raw) To: linux-iio, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler Cc: Jelle van der Waa This patch adds basic read_raw support for the DMARD09 3-axis accelerometer which can be found in a q8 A33 Allwinner tablet. [0] The driver is based on the Android driver which can be found on Github. [1] Unfortunately there is no datatsheet of the DMARD09 available online. [0] http://linux-sunxi.org/TZX-723Qa4 [1] https://github.com/JujuXIII/android_kernel_acer_v370_KK/tree/master/mediatek/custom/common/kernel/accelerometer/dmard09 Changes in v2: - Use ARRAY_SIZE instead of the #define DMARD09_AXES_NUM - Use a function-like macro to generate the channel structs - Remove duplicate 3-axis in driver description - Don't initialize the u8 buf - Use devm_iio_device_register and remove the now unrequired dmard09_remove. - Remove device from dmard09_data struct and use the client member to retrieve the device. - Describe the read strategy of the read_raw function - Simplify reading the X, Y, Z axis, by introducing DMARD09_AXIS_N_OFFSET, which removes the required if statements. - Log the _STAT address in the dev_error in the dmard09_read_raw function. Jelle van der Waa (1): iio: accel: add support for the Domintech DMARD09 3-axis accelerometer .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ drivers/iio/accel/Kconfig | 10 ++ drivers/iio/accel/Makefile | 1 + drivers/iio/accel/dmard09.c | 149 +++++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt create mode 100644 drivers/iio/accel/dmard09.c -- 2.9.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-18 20:54 ` [PATCH v2] " Jelle van der Waa @ 2016-07-18 20:54 ` Jelle van der Waa 2016-07-24 13:30 ` Jonathan Cameron 2016-07-24 13:25 ` [PATCH v2] " Jonathan Cameron 1 sibling, 1 reply; 11+ messages in thread From: Jelle van der Waa @ 2016-07-18 20:54 UTC (permalink / raw) To: linux-iio, Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler Cc: Jelle van der Waa Minimal implementation of an IIO driver for the Domintech DMARD09 3-axis accelerometer. Only supports reading the x,y,z axes at the moment. Implementation based on the Android driver from the Acer Liquid E2 kernel sources. Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> --- Changes in v2: - Use ARRAY_SIZE instead of the #define DMARD09_AXES_NUM - Use a function-like macro to generate the channel structs - Remove duplicate 3-axis in driver description - Don't initialize the u8 buf - Use devm_iio_device_register and remove the now unrequired dmard09_remove. - Remove device from dmard09_data struct and use the client member to retrieve the device. - Describe the read strategy of the read_raw function - Simplify reading the X, Y, Z axis, by introducing DMARD09_AXIS_N_OFFSET, which removes the required if statements. - Log the _STAT address in the dev_error in the dmard09_read_raw function. --- .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ drivers/iio/accel/Kconfig | 10 ++ drivers/iio/accel/Makefile | 1 + drivers/iio/accel/dmard09.c | 149 +++++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt create mode 100644 drivers/iio/accel/dmard09.c diff --git a/Documentation/devicetree/bindings/iio/accel/dmard09.txt b/Documentation/devicetree/bindings/iio/accel/dmard09.txt new file mode 100644 index 0000000..69b2a03 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/accel/dmard09.txt @@ -0,0 +1,13 @@ +Domintech DMARD09 accelerometer devicetree bindings + +Required properties: + + - compatible : should be "domintech,dmard09" + - reg : the I2C address of the sensor + +Example: + +dmard09@0x1d { + compatible = "domintech,dmard09"; + reg = <0x1d>; +}; diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index e4a758c..4b886fb 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -40,6 +40,16 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config DMARD09 + tristate "Domintech DMARD09 3-axis Accelerometer Driver" + depends on I2C + help + Say yes here to get support for the Domintech DMARD09 3-axis + accelerometer. + + Choosing M will build the driver as a module. If so, the module + will be called dmard09. + config HID_SENSOR_ACCEL_3D depends on HID_SENSOR_HUB select IIO_BUFFER diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 71b6794..b1022a0 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_BMA180) += bma180.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_DMARD09) += dmard09.o obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o obj-$(CONFIG_KXSD9) += kxsd9.o diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c new file mode 100644 index 0000000..8fba368 --- /dev/null +++ b/drivers/iio/accel/dmard09.c @@ -0,0 +1,149 @@ +/* + * IIO driver for the 3-axis accelerometer Domintech DMARD09. + * + * Copyright (c) 2016, Jelle van der Waa <jelle@vdwaa.nl> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include <linux/module.h> +#include <linux/i2c.h> +#include <linux/iio/iio.h> + +#define DMARD09_DRV_NAME "dmard09" + +#define DMARD09_REG_CHIPID 0x18 +#define DMARD09_REG_STAT 0x0A +#define DMARD09_REG_X 0x0C +#define DMARD09_REG_Y 0x0E +#define DMARD09_REG_Z 0x10 +#define DMARD09_CHIPID 0x95 + +#define DMARD09_BUF_LEN 8 +#define DMARD09_AXIS_X 0 +#define DMARD09_AXIS_Y 1 +#define DMARD09_AXIS_Z 2 +#define DMARD09_AXIS_X_OFFSET ((DMARD09_AXIS_X+1)*2) +#define DMARD09_AXIS_Y_OFFSET ((DMARD09_AXIS_Y+1)*2) +#define DMARD09_AXIS_Z_OFFSET ((DMARD09_AXIS_Z+1)*2) + +struct dmard09_data { + struct i2c_client *client; +}; + +#define DMARD09_CHANNEL(_axis, offset) { \ + .type = IIO_ACCEL, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .modified = 1, \ + .address = offset, \ + .channel2 = IIO_MOD_##_axis, \ +} + +static const struct iio_chan_spec dmard09_channels[] = { + DMARD09_CHANNEL(X, DMARD09_AXIS_X_OFFSET), + DMARD09_CHANNEL(Y, DMARD09_AXIS_Y_OFFSET), + DMARD09_CHANNEL(Z, DMARD09_AXIS_Z_OFFSET), +}; + +static int dmard09_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct dmard09_data *data = iio_priv(indio_dev); + u8 buf[DMARD09_BUF_LEN]; + int ret; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + /* + * Read from the DMAR09_REG_STAT register, since the chip + * caches reads from the individual X, Y, Z registers. + */ + ret = i2c_smbus_read_i2c_block_data(data->client, + DMARD09_REG_STAT, + DMARD09_BUF_LEN, buf); + if (ret < 0) { + dev_err(&data->client->dev, "Error reading reg %d\n", + DMARD09_REG_STAT); + return ret; + } + + *val = (s16)((buf[chan->address+1] << 8) | buf[chan->address]); + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static const struct iio_info dmard09_info = { + .driver_module = THIS_MODULE, + .read_raw = dmard09_read_raw, +}; + +static int dmard09_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + int ret; + struct iio_dev *indio_dev; + struct dmard09_data *data; + + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); + if (!indio_dev) { + dev_err(&client->dev, "iio allocation failed\n"); + return -ENOMEM; + } + + data = iio_priv(indio_dev); + data->client = client; + + ret = i2c_smbus_read_byte_data(data->client, DMARD09_REG_CHIPID); + if (ret < 0) { + dev_err(&client->dev, "Error reading chip id %d\n", ret); + return ret; + } + + if (ret != DMARD09_CHIPID) { + dev_err(&client->dev, "Invalid chip id %d\n", ret); + return -ENODEV; + } + + i2c_set_clientdata(client, indio_dev); + indio_dev->dev.parent = &client->dev; + indio_dev->name = DMARD09_DRV_NAME; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = dmard09_channels; + indio_dev->num_channels = ARRAY_SIZE(dmard09_channels); + indio_dev->info = &dmard09_info; + + return devm_iio_device_register(&client->dev, indio_dev); +} + +static const struct i2c_device_id dmard09_id[] = { + { "dmard09", 0}, + { }, +}; + +MODULE_DEVICE_TABLE(i2c, dmard09_id); + +static struct i2c_driver dmard09_driver = { + .driver = { + .name = DMARD09_DRV_NAME + }, + .probe = dmard09_probe, + .id_table = dmard09_id, +}; + +module_i2c_driver(dmard09_driver); + +MODULE_AUTHOR("Jelle van der Waa <jelle@vdwaa.nl>"); +MODULE_DESCRIPTION("DMARD09 3-axis accelerometer driver"); +MODULE_LICENSE("GPL"); -- 2.9.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-18 20:54 ` [PATCH] " Jelle van der Waa @ 2016-07-24 13:30 ` Jonathan Cameron 0 siblings, 0 replies; 11+ messages in thread From: Jonathan Cameron @ 2016-07-24 13:30 UTC (permalink / raw) To: Jelle van der Waa, linux-iio, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler On 18/07/16 21:54, Jelle van der Waa wrote: > Minimal implementation of an IIO driver for the Domintech DMARD09 3-axis > accelerometer. Only supports reading the x,y,z axes at the moment. > > Implementation based on the Android driver from the Acer Liquid E2 > kernel sources. > > Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl> > A few little points inline... Jonathan > --- > Changes in v2: > - Use ARRAY_SIZE instead of the #define DMARD09_AXES_NUM > - Use a function-like macro to generate the channel structs > - Remove duplicate 3-axis in driver description > - Don't initialize the u8 buf > - Use devm_iio_device_register and remove the now unrequired > dmard09_remove. > - Remove device from dmard09_data struct and use the client member to retrieve > the device. > - Describe the read strategy of the read_raw function > - Simplify reading the X, Y, Z axis, by introducing DMARD09_AXIS_N_OFFSET, > which removes the required if statements. > - Log the _STAT address in the dev_error in the dmard09_read_raw function. > --- > .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ > drivers/iio/accel/Kconfig | 10 ++ > drivers/iio/accel/Makefile | 1 + > drivers/iio/accel/dmard09.c | 149 +++++++++++++++++++++ > 4 files changed, 173 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt > create mode 100644 drivers/iio/accel/dmard09.c > > diff --git a/Documentation/devicetree/bindings/iio/accel/dmard09.txt b/Documentation/devicetree/bindings/iio/accel/dmard09.txt > new file mode 100644 > index 0000000..69b2a03 > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/accel/dmard09.txt > @@ -0,0 +1,13 @@ > +Domintech DMARD09 accelerometer devicetree bindings > + > +Required properties: > + > + - compatible : should be "domintech,dmard09" > + - reg : the I2C address of the sensor > + > +Example: > + > +dmard09@0x1d { > + compatible = "domintech,dmard09"; > + reg = <0x1d>; > +}; > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig > index e4a758c..4b886fb 100644 > --- a/drivers/iio/accel/Kconfig > +++ b/drivers/iio/accel/Kconfig > @@ -40,6 +40,16 @@ config BMC150_ACCEL_SPI > tristate > select REGMAP_SPI > > +config DMARD09 > + tristate "Domintech DMARD09 3-axis Accelerometer Driver" > + depends on I2C > + help > + Say yes here to get support for the Domintech DMARD09 3-axis > + accelerometer. > + > + Choosing M will build the driver as a module. If so, the module > + will be called dmard09. > + > config HID_SENSOR_ACCEL_3D > depends on HID_SENSOR_HUB > select IIO_BUFFER > diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile > index 71b6794..b1022a0 100644 > --- a/drivers/iio/accel/Makefile > +++ b/drivers/iio/accel/Makefile > @@ -7,6 +7,7 @@ obj-$(CONFIG_BMA180) += bma180.o > obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o > obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o > obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o > +obj-$(CONFIG_DMARD09) += dmard09.o > obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o > obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o > obj-$(CONFIG_KXSD9) += kxsd9.o > diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c > new file mode 100644 > index 0000000..8fba368 > --- /dev/null > +++ b/drivers/iio/accel/dmard09.c > @@ -0,0 +1,149 @@ > +/* > + * IIO driver for the 3-axis accelerometer Domintech DMARD09. > + * > + * Copyright (c) 2016, Jelle van der Waa <jelle@vdwaa.nl> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include <linux/module.h> > +#include <linux/i2c.h> > +#include <linux/iio/iio.h> > + > +#define DMARD09_DRV_NAME "dmard09" > + > +#define DMARD09_REG_CHIPID 0x18 > +#define DMARD09_REG_STAT 0x0A > +#define DMARD09_REG_X 0x0C > +#define DMARD09_REG_Y 0x0E > +#define DMARD09_REG_Z 0x10 > +#define DMARD09_CHIPID 0x95 > + > +#define DMARD09_BUF_LEN 8 > +#define DMARD09_AXIS_X 0 > +#define DMARD09_AXIS_Y 1 > +#define DMARD09_AXIS_Z 2 > +#define DMARD09_AXIS_X_OFFSET ((DMARD09_AXIS_X+1)*2) > +#define DMARD09_AXIS_Y_OFFSET ((DMARD09_AXIS_Y+1)*2) > +#define DMARD09_AXIS_Z_OFFSET ((DMARD09_AXIS_Z+1)*2) > + > +struct dmard09_data { > + struct i2c_client *client; > +}; > + > +#define DMARD09_CHANNEL(_axis, offset) { \ > + .type = IIO_ACCEL, \ > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ > + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ > + .modified = 1, \ > + .address = offset, \ > + .channel2 = IIO_MOD_##_axis, \ > +} > + > +static const struct iio_chan_spec dmard09_channels[] = { > + DMARD09_CHANNEL(X, DMARD09_AXIS_X_OFFSET), > + DMARD09_CHANNEL(Y, DMARD09_AXIS_Y_OFFSET), > + DMARD09_CHANNEL(Z, DMARD09_AXIS_Z_OFFSET), > +}; > + > +static int dmard09_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long mask) > +{ > + struct dmard09_data *data = iio_priv(indio_dev); > + u8 buf[DMARD09_BUF_LEN]; These are 16 bit registers (big endian I think). So __be16 would be better. > + int ret; > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + /* > + * Read from the DMAR09_REG_STAT register, since the chip > + * caches reads from the individual X, Y, Z registers. > + */ > + ret = i2c_smbus_read_i2c_block_data(data->client, > + DMARD09_REG_STAT, > + DMARD09_BUF_LEN, buf); > + if (ret < 0) { > + dev_err(&data->client->dev, "Error reading reg %d\n", > + DMARD09_REG_STAT); > + return ret; > + } > + > + *val = (s16)((buf[chan->address+1] << 8) | buf[chan->address]); Please check your kernel coding style. Should be spaces around that +. Also this is an endian conversion. Please use the relevant endian conversion functions to do this as in some cases they are free... *val = be16_to_cpu(buf[chan->address]); //with chan address fixed up.. > + > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > +} > + > +static const struct iio_info dmard09_info = { > + .driver_module = THIS_MODULE, > + .read_raw = dmard09_read_raw, > +}; > + > +static int dmard09_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + int ret; > + struct iio_dev *indio_dev; > + struct dmard09_data *data; > + > + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > + if (!indio_dev) { > + dev_err(&client->dev, "iio allocation failed\n"); > + return -ENOMEM; > + } > + > + data = iio_priv(indio_dev); > + data->client = client; > + > + ret = i2c_smbus_read_byte_data(data->client, DMARD09_REG_CHIPID); > + if (ret < 0) { > + dev_err(&client->dev, "Error reading chip id %d\n", ret); > + return ret; > + } > + > + if (ret != DMARD09_CHIPID) { > + dev_err(&client->dev, "Invalid chip id %d\n", ret); > + return -ENODEV; > + } > + > + i2c_set_clientdata(client, indio_dev); > + indio_dev->dev.parent = &client->dev; > + indio_dev->name = DMARD09_DRV_NAME; > + indio_dev->modes = INDIO_DIRECT_MODE; > + indio_dev->channels = dmard09_channels; > + indio_dev->num_channels = ARRAY_SIZE(dmard09_channels); > + indio_dev->info = &dmard09_info; > + > + return devm_iio_device_register(&client->dev, indio_dev); > +} > + > +static const struct i2c_device_id dmard09_id[] = { > + { "dmard09", 0}, > + { }, > +}; > + > +MODULE_DEVICE_TABLE(i2c, dmard09_id); > + > +static struct i2c_driver dmard09_driver = { > + .driver = { > + .name = DMARD09_DRV_NAME > + }, > + .probe = dmard09_probe, > + .id_table = dmard09_id, > +}; > + > +module_i2c_driver(dmard09_driver); > + > +MODULE_AUTHOR("Jelle van der Waa <jelle@vdwaa.nl>"); > +MODULE_DESCRIPTION("DMARD09 3-axis accelerometer driver"); > +MODULE_LICENSE("GPL"); > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-18 20:54 ` [PATCH v2] " Jelle van der Waa 2016-07-18 20:54 ` [PATCH] " Jelle van der Waa @ 2016-07-24 13:25 ` Jonathan Cameron 2016-07-24 14:11 ` Jelle van der Waa 1 sibling, 1 reply; 11+ messages in thread From: Jonathan Cameron @ 2016-07-24 13:25 UTC (permalink / raw) To: Jelle van der Waa, linux-iio, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler Hi Jelle, One quick process thing first. If you are sending a new version, please don't send it as a reply to the previous. I leads to convoluted and very deep threads where it isn't always clear which version is being replied to! Thanks, Jonathan On 18/07/16 21:54, Jelle van der Waa wrote: > This patch adds basic read_raw support for the DMARD09 3-axis accelerometer > which can be found in a q8 A33 Allwinner tablet. [0] > > The driver is based on the Android driver which can be found > on Github. [1] > > Unfortunately there is no datatsheet of the DMARD09 available online. > > [0] http://linux-sunxi.org/TZX-723Qa4 > [1] https://github.com/JujuXIII/android_kernel_acer_v370_KK/tree/master/mediatek/custom/common/kernel/accelerometer/dmard09 > > Changes in v2: > - Use ARRAY_SIZE instead of the #define DMARD09_AXES_NUM > - Use a function-like macro to generate the channel structs > - Remove duplicate 3-axis in driver description > - Don't initialize the u8 buf > - Use devm_iio_device_register and remove the now unrequired > dmard09_remove. > - Remove device from dmard09_data struct and use the client member to retrieve > the device. > - Describe the read strategy of the read_raw function > - Simplify reading the X, Y, Z axis, by introducing DMARD09_AXIS_N_OFFSET, > which removes the required if statements. > - Log the _STAT address in the dev_error in the dmard09_read_raw function. > > > Jelle van der Waa (1): > iio: accel: add support for the Domintech DMARD09 3-axis accelerometer > > .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ > drivers/iio/accel/Kconfig | 10 ++ > drivers/iio/accel/Makefile | 1 + > drivers/iio/accel/dmard09.c | 149 +++++++++++++++++++++ > 4 files changed, 173 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt > create mode 100644 drivers/iio/accel/dmard09.c > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-24 13:25 ` [PATCH v2] " Jonathan Cameron @ 2016-07-24 14:11 ` Jelle van der Waa 2016-07-24 18:56 ` Jonathan Cameron 0 siblings, 1 reply; 11+ messages in thread From: Jelle van der Waa @ 2016-07-24 14:11 UTC (permalink / raw) To: Jonathan Cameron Cc: linux-iio, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler On 07/24/16 at 02:25pm, Jonathan Cameron wrote: > Hi Jelle, > > One quick process thing first. If you are sending a new version, please > don't send it as a reply to the previous. I leads to convoluted > and very deep threads where it isn't always clear which version > is being replied to! Thanks, I'm quiet new to Linux kernel development. I hope to address the last few comments today and send out a v3. --- Jelle van der Waa > > Thanks, > > Jonathan > > On 18/07/16 21:54, Jelle van der Waa wrote: > > This patch adds basic read_raw support for the DMARD09 3-axis accelerometer > > which can be found in a q8 A33 Allwinner tablet. [0] > > > > The driver is based on the Android driver which can be found > > on Github. [1] > > > > Unfortunately there is no datatsheet of the DMARD09 available online. > > > > [0] http://linux-sunxi.org/TZX-723Qa4 > > [1] https://github.com/JujuXIII/android_kernel_acer_v370_KK/tree/master/mediatek/custom/common/kernel/accelerometer/dmard09 > > > > Changes in v2: > > - Use ARRAY_SIZE instead of the #define DMARD09_AXES_NUM > > - Use a function-like macro to generate the channel structs > > - Remove duplicate 3-axis in driver description > > - Don't initialize the u8 buf > > - Use devm_iio_device_register and remove the now unrequired > > dmard09_remove. > > - Remove device from dmard09_data struct and use the client member to retrieve > > the device. > > - Describe the read strategy of the read_raw function > > - Simplify reading the X, Y, Z axis, by introducing DMARD09_AXIS_N_OFFSET, > > which removes the required if statements. > > - Log the _STAT address in the dev_error in the dmard09_read_raw function. > > > > > > Jelle van der Waa (1): > > iio: accel: add support for the Domintech DMARD09 3-axis accelerometer > > > > .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ > > drivers/iio/accel/Kconfig | 10 ++ > > drivers/iio/accel/Makefile | 1 + > > drivers/iio/accel/dmard09.c | 149 +++++++++++++++++++++ > > 4 files changed, 173 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt > > create mode 100644 drivers/iio/accel/dmard09.c > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] iio: accel: add support for the Domintech DMARD09 3-axis accelerometer 2016-07-24 14:11 ` Jelle van der Waa @ 2016-07-24 18:56 ` Jonathan Cameron 0 siblings, 0 replies; 11+ messages in thread From: Jonathan Cameron @ 2016-07-24 18:56 UTC (permalink / raw) To: Jelle van der Waa Cc: linux-iio, Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler On 24/07/16 15:11, Jelle van der Waa wrote: > On 07/24/16 at 02:25pm, Jonathan Cameron wrote: >> Hi Jelle, >> >> One quick process thing first. If you are sending a new version, please >> don't send it as a reply to the previous. I leads to convoluted >> and very deep threads where it isn't always clear which version >> is being replied to! > > Thanks, > > I'm quiet new to Linux kernel development. I hope to address the last > few comments today and send out a v3. Cool, looking forward to it. I may not be able to look at it for a few weeks though as will be travelling a fair bit from next Saturday. May be mid August before I am able to get back on top of things. Jonathan > > > --- > Jelle van der Waa > >> >> Thanks, >> >> Jonathan >> >> On 18/07/16 21:54, Jelle van der Waa wrote: >>> This patch adds basic read_raw support for the DMARD09 3-axis accelerometer >>> which can be found in a q8 A33 Allwinner tablet. [0] >>> >>> The driver is based on the Android driver which can be found >>> on Github. [1] >>> >>> Unfortunately there is no datatsheet of the DMARD09 available online. >>> >>> [0] http://linux-sunxi.org/TZX-723Qa4 >>> [1] https://github.com/JujuXIII/android_kernel_acer_v370_KK/tree/master/mediatek/custom/common/kernel/accelerometer/dmard09 >>> >>> Changes in v2: >>> - Use ARRAY_SIZE instead of the #define DMARD09_AXES_NUM >>> - Use a function-like macro to generate the channel structs >>> - Remove duplicate 3-axis in driver description >>> - Don't initialize the u8 buf >>> - Use devm_iio_device_register and remove the now unrequired >>> dmard09_remove. >>> - Remove device from dmard09_data struct and use the client member to retrieve >>> the device. >>> - Describe the read strategy of the read_raw function >>> - Simplify reading the X, Y, Z axis, by introducing DMARD09_AXIS_N_OFFSET, >>> which removes the required if statements. >>> - Log the _STAT address in the dev_error in the dmard09_read_raw function. >>> >>> >>> Jelle van der Waa (1): >>> iio: accel: add support for the Domintech DMARD09 3-axis accelerometer >>> >>> .../devicetree/bindings/iio/accel/dmard09.txt | 13 ++ >>> drivers/iio/accel/Kconfig | 10 ++ >>> drivers/iio/accel/Makefile | 1 + >>> drivers/iio/accel/dmard09.c | 149 +++++++++++++++++++++ >>> 4 files changed, 173 insertions(+) >>> create mode 100644 Documentation/devicetree/bindings/iio/accel/dmard09.txt >>> create mode 100644 drivers/iio/accel/dmard09.c >>> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-07-24 18:56 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-07-16 19:51 [PATCH] Add support for the Domintech DMARD09 3-axis accelerometer Jelle van der Waa 2016-07-16 19:51 ` [PATCH] iio: accel: add " Jelle van der Waa 2016-07-17 16:12 ` Peter Meerwald-Stadler 2016-07-18 11:54 ` Lars-Peter Clausen 2016-07-18 17:01 ` Jonathan Cameron 2016-07-18 20:54 ` [PATCH v2] " Jelle van der Waa 2016-07-18 20:54 ` [PATCH] " Jelle van der Waa 2016-07-24 13:30 ` Jonathan Cameron 2016-07-24 13:25 ` [PATCH v2] " Jonathan Cameron 2016-07-24 14:11 ` Jelle van der Waa 2016-07-24 18:56 ` Jonathan Cameron
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).