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

Groups > linux.kernel > #1617238

Applied "ASoC: wm8978: Add OF device ID table" to the asoc tree

Show key headers only | View raw

The patch

   ASoC: wm8978: Add OF device ID table

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 5cf015d9cb02c360582b624497b0a1716881cf28 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javier@osg.samsung.com>
Date: Tue, 4 Apr 2017 15:26:29 -0400
Subject: [PATCH] ASoC: wm8978: Add OF device ID table

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-wm8978.ko | grep alias
alias:          i2c:wm8978

After this patch:

$ modinfo sound/soc/codecs/snd-soc-wm8978.ko | grep alias
alias:          i2c:wm8978
alias:          of:N*T*Cwlf,wm8978C*
alias:          of:N*T*Cwlf,wm8978

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/wm8978.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index 90b2d418ef60..cf761e2d7546 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -1071,9 +1071,16 @@ static const struct i2c_device_id wm8978_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
 
+static const struct of_device_id wm8978_of_match[] = {
+	{ .compatible = "wlf,wm8978", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, wm8978_of_match);
+
 static struct i2c_driver wm8978_i2c_driver = {
 	.driver = {
 		.name = "wm8978",
+		.of_match_table = wm8978_of_match,
 	},
 	.probe =    wm8978_i2c_probe,
 	.remove =   wm8978_i2c_remove,
-- 
2.11.0

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

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