Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933393AbbHLQWq (ORCPT ); Wed, 12 Aug 2015 12:22:46 -0400 Received: from mga02.intel.com ([134.134.136.20]:19767 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932110AbbHLQWo (ORCPT ); Wed, 12 Aug 2015 12:22:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,662,1432623600"; d="scan'208";a="782798084" Message-ID: <1439396160.2244.39.camel@spandruv-desk3.jf.intel.com> Subject: Re: [PATCH v3 5/6] iio: bmg160: Separate i2c and core driver From: Srinivas Pandruvada To: Markus Pargmann Cc: Jonathan Cameron , Vlad Dogaru , Paul Bolle , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Date: Wed, 12 Aug 2015 09:16:00 -0700 In-Reply-To: <1439391009-6051-6-git-send-email-mpa@pengutronix.de> References: <1439391009-6051-1-git-send-email-mpa@pengutronix.de> <1439391009-6051-6-git-send-email-mpa@pengutronix.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9767 Lines: 325 On Wed, 2015-08-12 at 16:50 +0200, Markus Pargmann wrote: > This patch separates the core driver using regmap and the i2c driver > which creates the i2c regmap. Also in the Kconfig file BMG160 and > BMG160_I2C are separate now. > > Signed-off-by: Markus Pargmann Reviewed-by: Srinivas Pandruvada > --- > drivers/iio/gyro/Kconfig | 18 +++++-- > drivers/iio/gyro/Makefile | 2 +- > drivers/iio/gyro/bmg160.h | 10 ++++ > drivers/iio/gyro/{bmg160.c => bmg160_core.c} | 77 +++++----------------------- > drivers/iio/gyro/bmg160_i2c.c | 71 +++++++++++++++++++++++++ > 5 files changed, 109 insertions(+), 69 deletions(-) > create mode 100644 drivers/iio/gyro/bmg160.h > rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (94%) > create mode 100644 drivers/iio/gyro/bmg160_i2c.c > > diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig > index cf82d74139a2..13f8e0051615 100644 > --- a/drivers/iio/gyro/Kconfig > +++ b/drivers/iio/gyro/Kconfig > @@ -51,17 +51,27 @@ config ADXRS450 > will be called adxrs450. > > config BMG160 > - tristate "BOSCH BMG160 Gyro Sensor" > - depends on I2C > + bool "BOSCH BMG160 Gyro Sensor" > select IIO_BUFFER > select IIO_TRIGGERED_BUFFER > - select REGMAP_I2C > help > Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor > driver. This driver also supports BMI055 gyroscope. > > +if BMG160 > + > +config BMG160_I2C > + tristate "Driver for connection via I2C" > + depends on I2C > + select REGMAP_I2C > + help > + Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor > + driver connected via I2C. This driver also supports BMI055 gyroscope. > + > This driver can also be built as a module. If so, the module > - will be called bmg160. > + will be called bmg160_i2c. > + > +endif > > config HID_SENSOR_GYRO_3D > depends on HID_SENSOR_HUB > diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile > index f46341b39139..73b41e43a974 100644 > --- a/drivers/iio/gyro/Makefile > +++ b/drivers/iio/gyro/Makefile > @@ -8,7 +8,7 @@ obj-$(CONFIG_ADIS16130) += adis16130.o > obj-$(CONFIG_ADIS16136) += adis16136.o > obj-$(CONFIG_ADIS16260) += adis16260.o > obj-$(CONFIG_ADXRS450) += adxrs450.o > -obj-$(CONFIG_BMG160) += bmg160.o > +obj-$(CONFIG_BMG160_I2C) += bmg160_core.o bmg160_i2c.o > > obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o > > diff --git a/drivers/iio/gyro/bmg160.h b/drivers/iio/gyro/bmg160.h > new file mode 100644 > index 000000000000..72db723c8fb6 > --- /dev/null > +++ b/drivers/iio/gyro/bmg160.h > @@ -0,0 +1,10 @@ > +#ifndef BMG160_H_ > +#define BMG160_H_ > + > +extern const struct dev_pm_ops bmg160_pm_ops; > + > +int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > + const char *name); > +void bmg160_core_remove(struct device *dev); > + > +#endif /* BMG160_H_ */ > diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160_core.c > similarity index 94% > rename from drivers/iio/gyro/bmg160.c > rename to drivers/iio/gyro/bmg160_core.c > index 39df64fb4262..d64e3a87e0a1 100644 > --- a/drivers/iio/gyro/bmg160.c > +++ b/drivers/iio/gyro/bmg160_core.c > @@ -13,7 +13,6 @@ > */ > > #include > -#include > #include > #include > #include > @@ -30,7 +29,6 @@ > #include > #include > > -#define BMG160_DRV_NAME "bmg160" > #define BMG160_IRQ_NAME "bmg160_event" > #define BMG160_GPIO_NAME "gpio_int" > > @@ -137,12 +135,6 @@ static const struct { > { 133, BMG160_RANGE_250DPS}, > { 66, BMG160_RANGE_125DPS} }; > > -struct regmap_config bmg160_regmap_i2c_conf = { > - .reg_bits = 8, > - .val_bits = 8, > - .max_register = 0x3f > -}; > - > static int bmg160_set_mode(struct bmg160_data *data, u8 mode) > { > int ret; > @@ -996,31 +988,22 @@ static const char *bmg160_match_acpi_device(struct device *dev) > return dev_name(dev); > } > > -static int bmg160_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > + const char *name) > { > struct bmg160_data *data; > struct iio_dev *indio_dev; > int ret; > - const char *name = NULL; > - struct regmap *regmap; > - struct device *dev = &client->dev; > - > - regmap = devm_regmap_init_i2c(client, &bmg160_regmap_i2c_conf); > - if (IS_ERR(regmap)) { > - dev_err(&client->dev, "Failed to register i2c regmap %d\n", > - (int)PTR_ERR(regmap)); > - return PTR_ERR(regmap); > - } > > - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > + indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); > if (!indio_dev) > return -ENOMEM; > > data = iio_priv(indio_dev); > dev_set_drvdata(dev, indio_dev); > data->dev = dev; > - data->irq = client->irq; > + data->irq = irq; > + data->regmap = regmap; > > ret = bmg160_chip_init(data); > if (ret < 0) > @@ -1028,9 +1011,6 @@ static int bmg160_probe(struct i2c_client *client, > > mutex_init(&data->mutex); > > - if (id) > - name = id->name; > - > if (ACPI_HANDLE(dev)) > name = bmg160_match_acpi_device(dev); > > @@ -1125,15 +1105,16 @@ err_trigger_unregister: > > return ret; > } > +EXPORT_SYMBOL_GPL(bmg160_core_probe); > > -static int bmg160_remove(struct i2c_client *client) > +void bmg160_core_remove(struct device *dev) > { > - struct iio_dev *indio_dev = i2c_get_clientdata(client); > + struct iio_dev *indio_dev = dev_get_drvdata(dev); > struct bmg160_data *data = iio_priv(indio_dev); > > - pm_runtime_disable(&client->dev); > - pm_runtime_set_suspended(&client->dev); > - pm_runtime_put_noidle(&client->dev); > + pm_runtime_disable(dev); > + pm_runtime_set_suspended(dev); > + pm_runtime_put_noidle(dev); > > iio_device_unregister(indio_dev); > iio_triggered_buffer_cleanup(indio_dev); > @@ -1146,9 +1127,8 @@ static int bmg160_remove(struct i2c_client *client) > mutex_lock(&data->mutex); > bmg160_set_mode(data, BMG160_MODE_DEEP_SUSPEND); > mutex_unlock(&data->mutex); > - > - return 0; > } > +EXPORT_SYMBOL_GPL(bmg160_core_remove); > > #ifdef CONFIG_PM_SLEEP > static int bmg160_suspend(struct device *dev) > @@ -1210,40 +1190,9 @@ static int bmg160_runtime_resume(struct device *dev) > } > #endif > > -static const struct dev_pm_ops bmg160_pm_ops = { > +const struct dev_pm_ops bmg160_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(bmg160_suspend, bmg160_resume) > SET_RUNTIME_PM_OPS(bmg160_runtime_suspend, > bmg160_runtime_resume, NULL) > }; > > -static const struct acpi_device_id bmg160_acpi_match[] = { > - {"BMG0160", 0}, > - {"BMI055B", 0}, > - {}, > -}; > - > -MODULE_DEVICE_TABLE(acpi, bmg160_acpi_match); > - > -static const struct i2c_device_id bmg160_id[] = { > - {"bmg160", 0}, > - {"bmi055_gyro", 0}, > - {} > -}; > - > -MODULE_DEVICE_TABLE(i2c, bmg160_id); > - > -static struct i2c_driver bmg160_driver = { > - .driver = { > - .name = BMG160_DRV_NAME, > - .acpi_match_table = ACPI_PTR(bmg160_acpi_match), > - .pm = &bmg160_pm_ops, > - }, > - .probe = bmg160_probe, > - .remove = bmg160_remove, > - .id_table = bmg160_id, > -}; > -module_i2c_driver(bmg160_driver); > - > -MODULE_AUTHOR("Srinivas Pandruvada "); > -MODULE_LICENSE("GPL v2"); > -MODULE_DESCRIPTION("BMG160 Gyro driver"); > diff --git a/drivers/iio/gyro/bmg160_i2c.c b/drivers/iio/gyro/bmg160_i2c.c > new file mode 100644 > index 000000000000..90126a5a7663 > --- /dev/null > +++ b/drivers/iio/gyro/bmg160_i2c.c > @@ -0,0 +1,71 @@ > +#include > +#include > +#include > +#include > +#include > + > +#include "bmg160.h" > + > +static const struct regmap_config bmg160_regmap_i2c_conf = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = 0x3f > +}; > + > +static int bmg160_i2c_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + struct regmap *regmap; > + const char *name = NULL; > + > + regmap = devm_regmap_init_i2c(client, &bmg160_regmap_i2c_conf); > + if (IS_ERR(regmap)) { > + dev_err(&client->dev, "Failed to register i2c regmap %d\n", > + (int)PTR_ERR(regmap)); > + return PTR_ERR(regmap); > + } > + > + if (id) > + name = id->name; > + > + return bmg160_core_probe(&client->dev, regmap, client->irq, name); > +} > + > +static int bmg160_i2c_remove(struct i2c_client *client) > +{ > + bmg160_core_remove(&client->dev); > + > + return 0; > +} > + > +static const struct acpi_device_id bmg160_acpi_match[] = { > + {"BMG0160", 0}, > + {"BMI055B", 0}, > + {}, > +}; > + > +MODULE_DEVICE_TABLE(acpi, bmg160_acpi_match); > + > +static const struct i2c_device_id bmg160_i2c_id[] = { > + {"bmg160", 0}, > + {"bmi055_gyro", 0}, > + {} > +}; > + > +MODULE_DEVICE_TABLE(i2c, bmg160_i2c_id); > + > +static struct i2c_driver bmg160_i2c_driver = { > + .driver = { > + .name = "bmg160_i2c", > + .acpi_match_table = ACPI_PTR(bmg160_acpi_match), > + .pm = &bmg160_pm_ops, > + }, > + .probe = bmg160_i2c_probe, > + .remove = bmg160_i2c_remove, > + .id_table = bmg160_i2c_id, > +}; > +module_i2c_driver(bmg160_i2c_driver); > + > +MODULE_AUTHOR("Srinivas Pandruvada "); > +MODULE_LICENSE("GPL v2"); > +MODULE_DESCRIPTION("BMG160 I2C Gyro driver"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/