Re: [PATCH v5 4/4] iio: accel: adxl345: Add SPI support
On Fri, Mar 03, 2017 at 06:55:26PM +0200, Andy Shevchenko wrote: > On Tue, Feb 28, 2017 at 4:37 AM, Eva Rachel Retuya> wrote: > > Add SPI driver that initializes SPI regmap for the adxl345 core driver. > > The driver supports the same functionality as I2C namely the x, y, z and > > scale readings. > > Portion of minor comments. > > > +config ADXL345_SPI > > + tristate "Analog Devices ADXL345 3-Axis Digital Accelerometer SPI > > Driver" > > > + depends on !(INPUT_ADXL34X=y || INPUT_ADXL34X=m) > > Same question. Would it be just > > depends on INPUT_ADXL34X=n > > ? > > > +/* Setting bits 7 and 6 enables multiple-byte read */ > > + .read_flag_mask = BIT(7) | BIT(6), > > GENMASK(7, 6) ? > True, but I would like to keep this as is. It is more readable and obvious than GENMASK(). > > +static int adxl345_spi_probe(struct spi_device *spi) > > +{ > > > + struct regmap *regmap; > > + const struct spi_device_id *id = spi_get_device_id(spi); > > Reverse order. > > And usually we do assignments from function parameters first. Ack. Thanks, Eva > > > + dev_err(>dev, "Error initializing spi regmap: %d\n", > > + (int)PTR_ERR(regmap)); > > Ugly casting! > > -- > With Best Regards, > Andy Shevchenko
Re: [PATCH v5 4/4] iio: accel: adxl345: Add SPI support
On Fri, Mar 03, 2017 at 06:55:26PM +0200, Andy Shevchenko wrote: > On Tue, Feb 28, 2017 at 4:37 AM, Eva Rachel Retuya > wrote: > > Add SPI driver that initializes SPI regmap for the adxl345 core driver. > > The driver supports the same functionality as I2C namely the x, y, z and > > scale readings. > > Portion of minor comments. > > > +config ADXL345_SPI > > + tristate "Analog Devices ADXL345 3-Axis Digital Accelerometer SPI > > Driver" > > > + depends on !(INPUT_ADXL34X=y || INPUT_ADXL34X=m) > > Same question. Would it be just > > depends on INPUT_ADXL34X=n > > ? > > > +/* Setting bits 7 and 6 enables multiple-byte read */ > > + .read_flag_mask = BIT(7) | BIT(6), > > GENMASK(7, 6) ? > True, but I would like to keep this as is. It is more readable and obvious than GENMASK(). > > +static int adxl345_spi_probe(struct spi_device *spi) > > +{ > > > + struct regmap *regmap; > > + const struct spi_device_id *id = spi_get_device_id(spi); > > Reverse order. > > And usually we do assignments from function parameters first. Ack. Thanks, Eva > > > + dev_err(>dev, "Error initializing spi regmap: %d\n", > > + (int)PTR_ERR(regmap)); > > Ugly casting! > > -- > With Best Regards, > Andy Shevchenko
Re: [PATCH v5 4/4] iio: accel: adxl345: Add SPI support
On Tue, Feb 28, 2017 at 4:37 AM, Eva Rachel Retuyawrote: > Add SPI driver that initializes SPI regmap for the adxl345 core driver. > The driver supports the same functionality as I2C namely the x, y, z and > scale readings. Portion of minor comments. > +config ADXL345_SPI > + tristate "Analog Devices ADXL345 3-Axis Digital Accelerometer SPI > Driver" > + depends on !(INPUT_ADXL34X=y || INPUT_ADXL34X=m) Same question. Would it be just depends on INPUT_ADXL34X=n ? > +/* Setting bits 7 and 6 enables multiple-byte read */ > + .read_flag_mask = BIT(7) | BIT(6), GENMASK(7, 6) ? > +static int adxl345_spi_probe(struct spi_device *spi) > +{ > + struct regmap *regmap; > + const struct spi_device_id *id = spi_get_device_id(spi); Reverse order. And usually we do assignments from function parameters first. > + dev_err(>dev, "Error initializing spi regmap: %d\n", > + (int)PTR_ERR(regmap)); Ugly casting! -- With Best Regards, Andy Shevchenko
Re: [PATCH v5 4/4] iio: accel: adxl345: Add SPI support
On Tue, Feb 28, 2017 at 4:37 AM, Eva Rachel Retuya wrote: > Add SPI driver that initializes SPI regmap for the adxl345 core driver. > The driver supports the same functionality as I2C namely the x, y, z and > scale readings. Portion of minor comments. > +config ADXL345_SPI > + tristate "Analog Devices ADXL345 3-Axis Digital Accelerometer SPI > Driver" > + depends on !(INPUT_ADXL34X=y || INPUT_ADXL34X=m) Same question. Would it be just depends on INPUT_ADXL34X=n ? > +/* Setting bits 7 and 6 enables multiple-byte read */ > + .read_flag_mask = BIT(7) | BIT(6), GENMASK(7, 6) ? > +static int adxl345_spi_probe(struct spi_device *spi) > +{ > + struct regmap *regmap; > + const struct spi_device_id *id = spi_get_device_id(spi); Reverse order. And usually we do assignments from function parameters first. > + dev_err(>dev, "Error initializing spi regmap: %d\n", > + (int)PTR_ERR(regmap)); Ugly casting! -- With Best Regards, Andy Shevchenko
[PATCH v5 4/4] iio: accel: adxl345: Add SPI support
Add SPI driver that initializes SPI regmap for the adxl345 core driver. The driver supports the same functionality as I2C namely the x, y, z and scale readings. Signed-off-by: Eva Rachel RetuyaReviewed-by: Andy Shevchenko --- Changes from v4: * Add Andy's Reviewed-by tag Changes from v3: * Revert to explicit and separate I2C and SPI configuration * Add OF match table, make it enumerable in ACPI environment (Andy's suggestion) drivers/iio/accel/Kconfig | 14 +++ drivers/iio/accel/Makefile | 1 + drivers/iio/accel/adxl345_spi.c | 83 + 3 files changed, 98 insertions(+) create mode 100644 drivers/iio/accel/adxl345_spi.c diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 9f5a889..8994175 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -22,6 +22,20 @@ config ADXL345_I2C will be called adxl345_i2c and you will also get adxl345_core for the core module. +config ADXL345_SPI + tristate "Analog Devices ADXL345 3-Axis Digital Accelerometer SPI Driver" + depends on !(INPUT_ADXL34X=y || INPUT_ADXL34X=m) + depends on SPI + select ADXL345 + select REGMAP_SPI + help + Say Y here if you want to build support for the Analog Devices + ADXL345 3-axis digital accelerometer. + + To compile this driver as a module, choose M here: the module + will be called adxl345_spi and you will also get adxl345_core + for the core module. + config BMA180 tristate "Bosch BMA180/BMA250 3-Axis Accelerometer Driver" depends on I2C diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 3f4a6d6..31fba19 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile @@ -5,6 +5,7 @@ # When adding new entries keep the list in alphabetical order obj-$(CONFIG_ADXL345) += adxl345_core.o obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o +obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o obj-$(CONFIG_BMA180) += bma180.o obj-$(CONFIG_BMA220) += bma220_spi.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c new file mode 100644 index 000..b7c2e7f --- /dev/null +++ b/drivers/iio/accel/adxl345_spi.c @@ -0,0 +1,83 @@ +/* + * ADXL345 3-Axis Digital Accelerometer + * + * Copyright (c) 2017 Eva Rachel Retuya + * + * This file is subject to the terms and conditions of version 2 of + * the GNU General Public License. See the file COPYING in the main + * directory of this archive for more details. + * + * SPI driver for ADXL345 + */ + +#include +#include +#include + +#include "adxl345.h" + +#define ADXL345_MAX_SPI_FREQ_HZ500 + +static const struct regmap_config adxl345_spi_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +/* Setting bits 7 and 6 enables multiple-byte read */ + .read_flag_mask = BIT(7) | BIT(6), +}; + +static int adxl345_spi_probe(struct spi_device *spi) +{ + struct regmap *regmap; + const struct spi_device_id *id = spi_get_device_id(spi); + + /* Bail out if max_speed_hz exceeds 5 MHz */ + if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) { + dev_err(>dev, "SPI CLK, %d Hz exceeds 5 MHz\n", + spi->max_speed_hz); + return -EINVAL; + } + + regmap = devm_regmap_init_spi(spi, _spi_regmap_config); + if (IS_ERR(regmap)) { + dev_err(>dev, "Error initializing spi regmap: %d\n", + (int)PTR_ERR(regmap)); + return PTR_ERR(regmap); + } + + return adxl345_common_probe(>dev, regmap, id->name); +} + +static int adxl345_spi_remove(struct spi_device *spi) +{ + return adxl345_common_remove(>dev); +} + +static const struct spi_device_id adxl345_spi_id[] = { + { "adxl345", 0 }, + { } +}; + +MODULE_DEVICE_TABLE(spi, adxl345_spi_id); + +static const struct of_device_id adxl345_of_match[] = { + { .compatible = "adi,adxl345" }, + { }, +}; + +MODULE_DEVICE_TABLE(of, adxl345_of_match); + +static struct spi_driver adxl345_spi_driver = { + .driver = { + .name = "adxl345_spi", + .of_match_table = adxl345_of_match, + }, + .probe = adxl345_spi_probe, + .remove = adxl345_spi_remove, + .id_table = adxl345_spi_id, +}; + +module_spi_driver(adxl345_spi_driver); + +MODULE_AUTHOR("Eva Rachel Retuya "); +MODULE_DESCRIPTION("ADXL345 3-Axis Digital Accelerometer SPI driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4
[PATCH v5 4/4] iio: accel: adxl345: Add SPI support
Add SPI driver that initializes SPI regmap for the adxl345 core driver. The driver supports the same functionality as I2C namely the x, y, z and scale readings. Signed-off-by: Eva Rachel Retuya Reviewed-by: Andy Shevchenko --- Changes from v4: * Add Andy's Reviewed-by tag Changes from v3: * Revert to explicit and separate I2C and SPI configuration * Add OF match table, make it enumerable in ACPI environment (Andy's suggestion) drivers/iio/accel/Kconfig | 14 +++ drivers/iio/accel/Makefile | 1 + drivers/iio/accel/adxl345_spi.c | 83 + 3 files changed, 98 insertions(+) create mode 100644 drivers/iio/accel/adxl345_spi.c diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 9f5a889..8994175 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -22,6 +22,20 @@ config ADXL345_I2C will be called adxl345_i2c and you will also get adxl345_core for the core module. +config ADXL345_SPI + tristate "Analog Devices ADXL345 3-Axis Digital Accelerometer SPI Driver" + depends on !(INPUT_ADXL34X=y || INPUT_ADXL34X=m) + depends on SPI + select ADXL345 + select REGMAP_SPI + help + Say Y here if you want to build support for the Analog Devices + ADXL345 3-axis digital accelerometer. + + To compile this driver as a module, choose M here: the module + will be called adxl345_spi and you will also get adxl345_core + for the core module. + config BMA180 tristate "Bosch BMA180/BMA250 3-Axis Accelerometer Driver" depends on I2C diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index 3f4a6d6..31fba19 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile @@ -5,6 +5,7 @@ # When adding new entries keep the list in alphabetical order obj-$(CONFIG_ADXL345) += adxl345_core.o obj-$(CONFIG_ADXL345_I2C) += adxl345_i2c.o +obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o obj-$(CONFIG_BMA180) += bma180.o obj-$(CONFIG_BMA220) += bma220_spi.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c new file mode 100644 index 000..b7c2e7f --- /dev/null +++ b/drivers/iio/accel/adxl345_spi.c @@ -0,0 +1,83 @@ +/* + * ADXL345 3-Axis Digital Accelerometer + * + * Copyright (c) 2017 Eva Rachel Retuya + * + * This file is subject to the terms and conditions of version 2 of + * the GNU General Public License. See the file COPYING in the main + * directory of this archive for more details. + * + * SPI driver for ADXL345 + */ + +#include +#include +#include + +#include "adxl345.h" + +#define ADXL345_MAX_SPI_FREQ_HZ500 + +static const struct regmap_config adxl345_spi_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +/* Setting bits 7 and 6 enables multiple-byte read */ + .read_flag_mask = BIT(7) | BIT(6), +}; + +static int adxl345_spi_probe(struct spi_device *spi) +{ + struct regmap *regmap; + const struct spi_device_id *id = spi_get_device_id(spi); + + /* Bail out if max_speed_hz exceeds 5 MHz */ + if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) { + dev_err(>dev, "SPI CLK, %d Hz exceeds 5 MHz\n", + spi->max_speed_hz); + return -EINVAL; + } + + regmap = devm_regmap_init_spi(spi, _spi_regmap_config); + if (IS_ERR(regmap)) { + dev_err(>dev, "Error initializing spi regmap: %d\n", + (int)PTR_ERR(regmap)); + return PTR_ERR(regmap); + } + + return adxl345_common_probe(>dev, regmap, id->name); +} + +static int adxl345_spi_remove(struct spi_device *spi) +{ + return adxl345_common_remove(>dev); +} + +static const struct spi_device_id adxl345_spi_id[] = { + { "adxl345", 0 }, + { } +}; + +MODULE_DEVICE_TABLE(spi, adxl345_spi_id); + +static const struct of_device_id adxl345_of_match[] = { + { .compatible = "adi,adxl345" }, + { }, +}; + +MODULE_DEVICE_TABLE(of, adxl345_of_match); + +static struct spi_driver adxl345_spi_driver = { + .driver = { + .name = "adxl345_spi", + .of_match_table = adxl345_of_match, + }, + .probe = adxl345_spi_probe, + .remove = adxl345_spi_remove, + .id_table = adxl345_spi_id, +}; + +module_spi_driver(adxl345_spi_driver); + +MODULE_AUTHOR("Eva Rachel Retuya "); +MODULE_DESCRIPTION("ADXL345 3-Axis Digital Accelerometer SPI driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4