[PATCH 2/6] ASoC: ssm4567: Add OF device ID table

From	Javier Martinez Canillas <javier@osg.samsung.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/6] ASoC: ssm4567: Add OF device ID table
Date	2017-04-04 21:30 +0200
Message-ID	<tsCjn-Jw-9@gated-at.bofh.it> (permalink)
References	<tsCjn-Jw-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

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.

Before this patch:

$ modinfo sound/soc/codecs/snd-soc-ssm4567.ko | grep alias
alias:          acpi*:INT343B:*
alias:          i2c:ssm4567

After this patch:

$ modinfo sound/soc/codecs/snd-soc-ssm4567.ko | grep alias
alias:          acpi*:INT343B:*
alias:          of:N*T*Cadi,ssm4567C*
alias:          of:N*T*Cadi,ssm4567
alias:          i2c:ssm4567

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

 sound/soc/codecs/ssm4567.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c
index 2bb5a11c9ba1..a622623e8558 100644
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@ -485,6 +485,14 @@ static const struct i2c_device_id ssm4567_i2c_ids[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ssm4567_i2c_ids);
 
+#ifdef CONFIG_OF
+static const struct of_device_id ssm4567_of_match[] = {
+	{ .compatible = "adi,ssm4567", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, ssm4567_of_match);
+#endif
+
 #ifdef CONFIG_ACPI
 
 static const struct acpi_device_id ssm4567_acpi_match[] = {
@@ -498,6 +506,7 @@ MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_match);
 static struct i2c_driver ssm4567_driver = {
 	.driver = {
 		.name = "ssm4567",
+		.of_match_table = of_match_ptr(ssm4567_of_match),
 		.acpi_match_table = ACPI_PTR(ssm4567_acpi_match),
 	},
 	.probe = ssm4567_i2c_probe,
-- 
2.9.3

Thread

[PATCH 0/6] ASoC: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 21:30 +0200
  [PATCH 2/6] ASoC: ssm4567: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 21:30 +0200
    Applied "ASoC: ssm4567: Add OF device ID table" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-04-05 19:40 +0200
  [PATCH 5/6] ASoC: wm8978: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 21:30 +0200
    Re: [PATCH 5/6] ASoC: wm8978: Add OF device ID table Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2017-04-05 18:10 +0200
    Applied "ASoC: wm8978: Add OF device ID table" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-04-05 19:40 +0200
  [PATCH 6/6] ASoC: rt5677: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 21:30 +0200
    Applied "ASoC: rt5677: Add OF device ID table" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-04-05 19:40 +0200
  [PATCH 1/6] ASoc: rt5645: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 21:30 +0200
    Applied "ASoc: rt5645: Add OF device ID table" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-04-05 19:40 +0200
  [PATCH 4/6] ASoC: uda1380: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-04-04 21:30 +0200
    Applied "ASoC: uda1380: Add OF device ID table" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-04-05 19:40 +0200

csiph-web