On Tue, Sep 01, 2015 at 07:10:57AM -0700, Srinivas Pandruvada wrote:
> On Mon, 2015-08-31 at 17:18 +0100, Jonathan Cameron wrote:
> > On 20/08/15 13:49, Markus Pargmann wrote:
> > > Add a simple SPI driver which initializes the spi regmap for the
> > > bmc150
> > > core driver.
> > >
> > > Signed-off-by: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
> > Looks good to me, but clearly will have to wait for the earlier
> > patches in the series.
> >
> > Nearly there!
> >
> > Jonathan
> > > ---
> > > drivers/iio/accel/Kconfig | 5 +++
> > > drivers/iio/accel/Makefile | 1 +
> > > drivers/iio/accel/bmc150-accel-spi.c | 83
> > > ++++++++++++++++++++++++++++++++++++
> > > 3 files changed, 89 insertions(+)
> > > create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
> > >
> > > diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
> > > index 6da4eb0db57b..56d24fa3d34a 100644
> > > --- a/drivers/iio/accel/Kconfig
> > > +++ b/drivers/iio/accel/Kconfig
> > > @@ -23,6 +23,7 @@ config BMC150_ACCEL
> > > select IIO_TRIGGERED_BUFFER
> > > select REGMAP
> > > select BMC150_ACCEL_I2C if I2C
> > > + select BMC150_ACCEL_SPI if SPI
> > > help
> > > Say yes here to build support for the following Bosch
> > > accelerometers:
> > > BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
> > > @@ -35,6 +36,10 @@ config BMC150_ACCEL_I2C
> > > tristate
> > > select REGMAP_I2C
> > >
> > > +config BMC150_ACCEL_SPI
> > > + tristate
> > > + select REGMAP_SPI
> > > +
> > > 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 5ef8bdbad092..e579e93bf022 100644
> > > --- a/drivers/iio/accel/Makefile
> > > +++ b/drivers/iio/accel/Makefile
> > > @@ -6,6 +6,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_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/bmc150-accel-spi.c
> > > b/drivers/iio/accel/bmc150-accel-spi.c
> > > new file mode 100644
> > > index 000000000000..1c2a4f683da4
> > > --- /dev/null
> > > +++ b/drivers/iio/accel/bmc150-accel-spi.c
> > > @@ -0,0 +1,83 @@
> > > +/*
> > > + * 3-axis accelerometer driver supporting following I2C Bosch
> > > -Sensortec chips:
> > > + * - BMC150
> > > + * - BMI055
> > > + * - BMA255
> > > + * - BMA250E
> > > + * - BMA222E
> > > + * - BMA280
> > > + *
> > > + * Copyright (c) 2014, Intel Corporation.
> > > + *
> > > + * 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.
> > > + */
> Not sure If you want to carry Intel Copyright for SPI driver part. If
> you want to use change the year to 2015.
Thanks, will replace that.
Best Regards,
Markus
> > > +
> > > +#include <linux/device.h>
> > > +#include <linux/mod_devicetable.h>
> > > +#include <linux/module.h>
> > > +#include <linux/acpi.h>
> > > +#include <linux/regmap.h>
> > > +#include <linux/spi/spi.h>
> > > +
> > > +#include "bmc150-accel.h"
> > > +
> > > +static const struct regmap_config bmc150_spi_regmap_conf = {
> > > + .reg_bits = 8,
> > > + .val_bits = 8,
> > > + .max_register = 0x3f,
> > > +};
> > > +
> > > +static int bmc150_accel_probe(struct spi_device *spi)
> > > +{
> > > + struct regmap *regmap;
> > > + const struct spi_device_id *id = spi_get_device_id(spi);
> > > +
> > > + regmap = devm_regmap_init_spi(spi,
> > > &bmc150_spi_regmap_conf);
> > > + if (IS_ERR(regmap)) {
> > > + dev_err(&spi->dev, "Failed to initialize spi
> > > regmap\n");
> > > + return PTR_ERR(regmap);
> > > + }
> > > +
> > > + return bmc150_accel_core_probe(&spi->dev, regmap, spi
> > > ->irq,
> > > + id->name, id->driver_data,
> > > true);
> > > +}
> > > +
> > > +static int bmc150_accel_remove(struct spi_device *spi)
> > > +{
> > > + return bmc150_accel_core_remove(&spi->dev);
> > > +}
> > > +
> > > +static const struct spi_device_id bmc150_accel_id[] = {
> > > + {"bmc150_accel", bmc150},
> > > + {"bmi055_accel", bmi055},
> > > + {"bma255", bma255},
> > > + {"bma250e", bma250e},
> > > + {"bma222e", bma222e},
> > > + {"bma280", bma280},
> > > + {}
> > > +};
> > > +
> > > +MODULE_DEVICE_TABLE(spi, bmc150_accel_id);
> > > +
> > > +static struct spi_driver bmc150_accel_driver = {
> > > + .driver = {
> > > + .name = "bmc150_accel_spi",
> > > + .acpi_match_table =
> > > ACPI_PTR(bmc150_accel_acpi_match),
> > > + .pm = &bmc150_accel_pm_ops,
> > > + },
> > > + .probe = bmc150_accel_probe,
> > > + .remove = bmc150_accel_remove,
> > > + .id_table = bmc150_accel_id,
> > > +};
> > > +module_spi_driver(bmc150_accel_driver);
> > > +
> > > +MODULE_AUTHOR("Markus Pargmann <mpa@xxxxxxxxxxxxxx>");
> > > +MODULE_LICENSE("GPL v2");
> > > +MODULE_DESCRIPTION("BMC150 SPI accelerometer driver");
> > >
> >
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: Digital signature
