Skip to contentSkip to conversation

ASoC: codec: Add WM8987 device id to WM8750 driver

PATCH Applied Maurus Cuelenaere 2 participants 4 messages Jul 3, 2010 – Jul 4, 2010

Subsystems (3)
Sound ASoC Wolfson microelectronics drivers
lore
Share & tools
lore

Maurus Cuelenaere

author
#0 lore raw

PATCH 1/3 ASoC: codec: Add WM8987 device id to WM8750 driver

The WM8987 codec is register compatible with the WM8750, so just add it to the SPI and I²C device table.

Signed-off-by Maurus Cuelenaere <[email protected]>
---
 sound/soc/codecs/wm8750.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
sound/soc/codecs/wm8750.c +10 -1
index 9407e19..e2c05e3 100644
@@ -884,6 +884,7 @@ static int wm8750_i2c_remove(struct i2c_client *client)
 
 static const struct i2c_device_id wm8750_i2c_id[] = {
 	{ "wm8750", 0 },
+	{ "wm8987", 0 }, /* WM8987 is register compatible with WM8750 */
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id);

@@ -925,14 +926,22 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi)
 	return 0;
 }
 
+static const struct spi_device_id wm8750_spi_id[] = {
+	{ "wm8750", 0 },
+	{ "wm8987", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(spi, wm8750_spi_id);
+
 static struct spi_driver wm8750_spi_driver = {
 	.driver = {
-		.name	= "wm8750",
+		.name	= "WM8750 SPI Codec",
 		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 	},
 	.probe		= wm8750_spi_probe,
 	.remove		= __devexit_p(wm8750_spi_remove),
+	.id_table	= wm8750_spi_id,
 };
 #endif
Signature · 6 lines
1.7.0.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Applied
#1 lore raw
Quoted 4 lines · Maurus Cuelenaere

The WM8987 codec is register compatible with the WM8750, so just add it to the SPI and I²C device table.

Signed-off-by Maurus Cuelenaere <[email protected]>

Applied, thanks. Though...

sound/soc/codecs/wm8750.c static int __devexit wm8750_spi_remove(struct spi_device *spi) · line 938

Quoted 3 lines
sound/soc/codecs/wm8750.c +1 -1
 	.driver = {
-		.name	= "wm8750",
+		.name	= "WM8750 SPI Codec",

...that naming isn't going to look pretty in kernel logs with dev_() print statements.

author
#2 lore raw

Op 04-07-10 10:59, Mark Brown schreef:

Quoted 11 lines · Maurus Cuelenaere
Quoted 3 lines

The WM8987 codec is register compatible with the WM8750, so just add it to the SPI and I²C device table.

Signed-off-by Maurus Cuelenaere <[email protected]>

Applied, thanks. Though...

sound/soc/codecs/wm8750.c static int __devexit wm8750_spi_remove(struct spi_device *spi) · line 938

Quoted 3 lines
sound/soc/codecs/wm8750.c +1 -1
 	.driver = {
-		.name	= "wm8750",
+		.name	= "WM8750 SPI Codec",

...that naming isn't going to look pretty in kernel logs with dev_() print statements.

It's the same as how the I²C driver is named, so I guess that has the same problem then.

Signature · 1 line
Maurus Cuelenaere
#3 lore raw

On Sun, Jul 04, 2010 at 11:16:32AM +0200, Maurus Cuelenaere wrote:

[Please fix your MUA to word wrap.]

Quoted 2 lines

It's the same as how the I²C driver is named, so I guess that has the same problem then.

Yes, several of the older drivers do have this problem.