Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1601050

[PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table

Show all headers | View raw

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have an
OF device ID table if the devices are registered via OF.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/iio/magnetometer/bmc150_magn_i2c.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/iio/magnetometer/bmc150_magn_i2c.c b/drivers/iio/magnetometer/bmc150_magn_i2c.c
index ee05722587aa..57e40dd1222e 100644
--- a/drivers/iio/magnetometer/bmc150_magn_i2c.c
+++ b/drivers/iio/magnetometer/bmc150_magn_i2c.c
@@ -63,9 +63,18 @@ static const struct i2c_device_id bmc150_magn_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, bmc150_magn_i2c_id);
 
+static const struct of_device_id bmc150_magn_of_match[] = {
+	{ .compatible = "bosch,bmc150_magn" },
+	{ .compatible = "bosch,bmc156_magn" },
+	{ .compatible = "bosch,bmm150_magn" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, bmc150_magn_of_match);
+
 static struct i2c_driver bmc150_magn_driver = {
 	.driver = {
 		.name	= "bmc150_magn_i2c",
+		.of_match_table = bmc150_magn_of_match,
 		.acpi_match_table = ACPI_PTR(bmc150_magn_acpi_match),
 		.pm	= &bmc150_magn_pm_ops,
 	},
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/17] iio: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
  [PATCH v2 11/17] iio: dac: max5821: Set .of_match_table to OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
    Re: [PATCH v2 11/17] iio: dac: max5821: Set .of_match_table to OF  device ID table Jonathan Cameron <jic23@kernel.org> - 2017-03-19 12:00 +0100
  [PATCH v2 02/17] iio: mlx96014: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
    Re: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table Crt Mori <cmo@melexis.com> - 2017-03-15 11:50 +0100
      Re: [PATCH v2 02/17] iio: mlx96014: Add OF device ID table Jonathan Cameron <jic23@kernel.org> - 2017-03-19 12:00 +0100
  [PATCH v2 13/17] iio: magnetometer: mag3110: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
    Re: [PATCH v2 13/17] iio: magnetometer: mag3110: Add OF device ID  table Jonathan Cameron <jic23@kernel.org> - 2017-03-19 12:00 +0100
  [PATCH v2 04/17] iio: dac: mcp4725: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
    Re: [PATCH v2 04/17] iio: dac: mcp4725: Add OF device ID table Jonathan Cameron <jic23@kernel.org> - 2017-03-19 12:00 +0100
  [PATCH v2 15/17] iio: pressure: mpl3115: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
    Re: [PATCH v2 15/17] iio: pressure: mpl3115: Add OF device ID table Jonathan Cameron <jic23@kernel.org> - 2017-03-19 12:00 +0100
  [PATCH v2 07/17] iio: pressure: hp03: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
  [PATCH v2 10/17] iio: light: apds9960: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
  [PATCH v2 08/17] iio: imu: inv_mpu6050: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
  [PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-15 05:50 +0100
    Re: [PATCH v2 03/17] iio: magnetometer: bmc150_magn_i2c: Add OF  device ID table Jonathan Cameron <jic23@kernel.org> - 2017-03-19 12:00 +0100

csiph-web