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

Groups > linux.kernel > #1616122

[PATCH v4 3/8] mfd: retu: 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 a
OF device ID table if the devices are registered via OF.

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

---

Changes in v4:
- Drop -mfd suffix in compatible string (Lee Jones).

Changes in v3:
- Add a vendor prefix to the compatible string (Rob Herring).

Changes in v2:
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.

 drivers/mfd/retu-mfd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index 53e1d386d2c0..e7d27b7861c1 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -308,9 +308,17 @@ static const struct i2c_device_id retu_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, retu_id);
 
+static const struct of_device_id retu_of_match[] = {
+	{ .compatible = "nokia,retu" },
+	{ .compatible = "nokia,tahvo" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, retu_of_match);
+
 static struct i2c_driver retu_driver = {
 	.driver		= {
 		.name = "retu-mfd",
+		.of_match_table = retu_of_match,
 	},
 	.probe		= retu_probe,
 	.remove		= retu_remove,
-- 
2.9.3

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

Thread

[PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
  [PATCH v4 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
  [PATCH v4 8/8] ARM: ux500: Add vendor prefix to tps61052 node Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
  [PATCH v4 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
  [PATCH v4 6/8] dt-bindings: mfd: Add TI tps6105x chip bindings Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
  [PATCH v4 3/8] mfd: retu: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
  [PATCH v4 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 17:40 +0200
    Re: [PATCH v4 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Rob Herring <robh+dt@kernel.org> - 2017-04-04 19:00 +0200
      Re: [PATCH v4 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips  bindings Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 19:10 +0200
  Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are  missing it Rob Herring <robh+dt@kernel.org> - 2017-04-04 19:00 +0200
  Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are  missing it Aaro Koskinen <aaro.koskinen@iki.fi> - 2017-04-04 19:40 +0200
  Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are  missing it Tony Lindgren <tony@atomide.com> - 2017-04-04 19:50 +0200
    Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are  missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 19:50 +0200

csiph-web