| Message ID | 1384876234-1211-2-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/19/13 15:50, Maxime Ripard wrote: > Add the compatibles supported by the st_sensors library. This uses kind > of a hack, since the st_sensors core will actively check at probe time > that the device name matches the one reported when using old style i2c > probing, and that this name will be different with device tree. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Note that this is unnecessary give core i2c matching, until we have some more elements in the binding. I'd certainly expect the interrupts on the relevant devices to be in the binding... > --- > .../devicetree/bindings/iio/accel/st_accel_i2c.txt | 22 +++++++++++++++ > drivers/iio/accel/st_accel_i2c.c | 33 ++++++++++++++++++++++ > 2 files changed, 55 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt > > diff --git a/Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt b/Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt > new file mode 100644 > index 000000000000..4a1efdf1775f > --- /dev/null > +++ b/Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt > @@ -0,0 +1,22 @@ > +* ST Micro accelerometer sensors > + > +Required properties: > + - compatible : should be either: > + * "st,lis3dh" > + * "st,lis331dlh" > + * "st,lsm303dl-accel" > + * "st,lsm303dlh-accel" > + * "st,lsm303dlhc-accel" > + * "st,lsm303dlm-accel" > + * "st,lsm330-accel" > + * "st,lsm330d-accel" > + * "st,lsm330dl-accel" > + * "st,lsm330dlc-accel" > + - reg : the I2C address of the sensor > + > +Example: > + > +accel: accel@19 { > + compatible = "st,lsm330dlc-accel"; > + reg = <0x19>; > +}; > diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c > index d7bedbdfc81d..de2bf76378d8 100644 > --- a/drivers/iio/accel/st_accel_i2c.c > +++ b/drivers/iio/accel/st_accel_i2c.c > @@ -13,11 +13,27 @@ > #include <linux/slab.h> > #include <linux/i2c.h> > #include <linux/iio/iio.h> > +#include <linux/of_device.h> > > #include <linux/iio/common/st_sensors.h> > #include <linux/iio/common/st_sensors_i2c.h> > #include "st_accel.h" > > +static const struct of_device_id st_accel_of_table[] = { > + { .compatible = "st,lis3dh", .data = LIS3DH_ACCEL_DEV_NAME }, > + { .compatible = "st,lis331dlh", .data = LIS331DLH_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm303dl-accel", .data = LSM303DL_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm303dlh-accel", .data = LSM303DLH_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm303dlhc-accel", .data = LSM303DLHC_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm303dlm-accel", .data = LSM303DLM_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm330-accel", .data = LSM330_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm330d-accel", .data = LSM330D_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm330dl-accel", .data = LSM330DL_ACCEL_DEV_NAME }, > + { .compatible = "st,lsm330dlc-accel", .data = LSM330DLC_ACCEL_DEV_NAME }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, st_accel_of_table); > + > static int st_accel_i2c_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > @@ -34,6 +50,22 @@ static int st_accel_i2c_probe(struct i2c_client *client, > > st_sensors_i2c_configure(indio_dev, client, adata); > > + /* > + * If we are probed through DT, st_sensors_i2c_configure will > + * fill the indio_dev->name string with the client->name, > + * which is the compatible without the vendor prefix. Since > + * compatibles separators are usually "-", and that the > + * convention in this driver is using "_", we obviously have a > + * problem when the st-sensors core checks that the two > + * strings matches. We need to set again the indio_dev->name > + * string to the real value used by the core later on. > + */ > + if (client->dev.of_node) { > + const struct of_device_id *device; > + device = of_match_device(st_accel_of_table, &client->dev); > + indio_dev->name = device->data; > + } > + > err = st_accel_common_probe(indio_dev, client->dev.platform_data); > if (err < 0) > return err; > @@ -67,6 +99,7 @@ static struct i2c_driver st_accel_driver = { > .driver = { > .owner = THIS_MODULE, > .name = "st-accel-i2c", > + .of_match_table = of_match_ptr(st_accel_of_table), > }, > .probe = st_accel_i2c_probe, > .remove = st_accel_i2c_remove, >
On Sat, Nov 30, 2013 at 12:04:20PM +0000, Jonathan Cameron wrote: > On 11/19/13 15:50, Maxime Ripard wrote: > > Add the compatibles supported by the st_sensors library. This uses kind > > of a hack, since the st_sensors core will actively check at probe time > > that the device name matches the one reported when using old style i2c > > probing, and that this name will be different with device tree. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Note that this is unnecessary give core i2c matching, until we have some > more elements in the binding. I'd certainly expect the interrupts > on the relevant devices to be in the binding... This interrupt DT thing has been stalled for monthes, I don't have any hardware to test the interrupts, maybe we can just move forward and wait for someone that have the need for the interrupts to do the work? Maxime
diff --git a/Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt b/Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt new file mode 100644 index 000000000000..4a1efdf1775f --- /dev/null +++ b/Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt @@ -0,0 +1,22 @@ +* ST Micro accelerometer sensors + +Required properties: + - compatible : should be either: + * "st,lis3dh" + * "st,lis331dlh" + * "st,lsm303dl-accel" + * "st,lsm303dlh-accel" + * "st,lsm303dlhc-accel" + * "st,lsm303dlm-accel" + * "st,lsm330-accel" + * "st,lsm330d-accel" + * "st,lsm330dl-accel" + * "st,lsm330dlc-accel" + - reg : the I2C address of the sensor + +Example: + +accel: accel@19 { + compatible = "st,lsm330dlc-accel"; + reg = <0x19>; +}; diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c index d7bedbdfc81d..de2bf76378d8 100644 --- a/drivers/iio/accel/st_accel_i2c.c +++ b/drivers/iio/accel/st_accel_i2c.c @@ -13,11 +13,27 @@ #include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> +#include <linux/of_device.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> #include "st_accel.h" +static const struct of_device_id st_accel_of_table[] = { + { .compatible = "st,lis3dh", .data = LIS3DH_ACCEL_DEV_NAME }, + { .compatible = "st,lis331dlh", .data = LIS331DLH_ACCEL_DEV_NAME }, + { .compatible = "st,lsm303dl-accel", .data = LSM303DL_ACCEL_DEV_NAME }, + { .compatible = "st,lsm303dlh-accel", .data = LSM303DLH_ACCEL_DEV_NAME }, + { .compatible = "st,lsm303dlhc-accel", .data = LSM303DLHC_ACCEL_DEV_NAME }, + { .compatible = "st,lsm303dlm-accel", .data = LSM303DLM_ACCEL_DEV_NAME }, + { .compatible = "st,lsm330-accel", .data = LSM330_ACCEL_DEV_NAME }, + { .compatible = "st,lsm330d-accel", .data = LSM330D_ACCEL_DEV_NAME }, + { .compatible = "st,lsm330dl-accel", .data = LSM330DL_ACCEL_DEV_NAME }, + { .compatible = "st,lsm330dlc-accel", .data = LSM330DLC_ACCEL_DEV_NAME }, + {}, +}; +MODULE_DEVICE_TABLE(of, st_accel_of_table); + static int st_accel_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -34,6 +50,22 @@ static int st_accel_i2c_probe(struct i2c_client *client, st_sensors_i2c_configure(indio_dev, client, adata); + /* + * If we are probed through DT, st_sensors_i2c_configure will + * fill the indio_dev->name string with the client->name, + * which is the compatible without the vendor prefix. Since + * compatibles separators are usually "-", and that the + * convention in this driver is using "_", we obviously have a + * problem when the st-sensors core checks that the two + * strings matches. We need to set again the indio_dev->name + * string to the real value used by the core later on. + */ + if (client->dev.of_node) { + const struct of_device_id *device; + device = of_match_device(st_accel_of_table, &client->dev); + indio_dev->name = device->data; + } + err = st_accel_common_probe(indio_dev, client->dev.platform_data); if (err < 0) return err; @@ -67,6 +99,7 @@ static struct i2c_driver st_accel_driver = { .driver = { .owner = THIS_MODULE, .name = "st-accel-i2c", + .of_match_table = of_match_ptr(st_accel_of_table), }, .probe = st_accel_i2c_probe, .remove = st_accel_i2c_remove,
Add the compatibles supported by the st_sensors library. This uses kind of a hack, since the st_sensors core will actively check at probe time that the device name matches the one reported when using old style i2c probing, and that this name will be different with device tree. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- .../devicetree/bindings/iio/accel/st_accel_i2c.txt | 22 +++++++++++++++ drivers/iio/accel/st_accel_i2c.c | 33 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/accel/st_accel_i2c.txt