Skip to contentSkip to conversation

ASoC: Add device tree binding for WM8731

PATCH Grant Likely 1 participant 1 message Jul 28, 2011 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 23 lines · Mark Brown

Tested with the famous "hey, look! this compiles" test plan.

---
 Documentation/devicetree/bindings/sound/wm8731.txt |   18 ++++++++++++++++++
 sound/soc/codecs/wm8731.c                          |   12 ++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
Documentation/devicetree/bindings/sound/wm8731.txt new file +8 -0
new file mode 100644
index 0000000..15f7004
@@ -0,0 +1,18 @@
+WM8731 audio CODEC
+
+This device supports both I2C and SPI (configured with pin strapping
+on the board).
+
+Required properties:
+
+  - compatible : "wlf,wm8731"

Documentation/devicetree/bindings/sound/wm8731.txt line 18

Quoted 10 lines
Documentation/devicetree/bindings/sound/wm8731.txt new file +10 -0
+
+  - reg : the I2C address of the device for I2C, the chip select
+          number for SPI.
+
+Example:
+
+codec: wm8731@1a {
+	compatible = "wlf,wm8731";
+	reg = <0x1a>;
+};

Acked by: Grant Likely <[email protected]>

Although I'm sure some actual testing would be valuable before it is actually merged. :-) And there is one comment below.

Quoted 25 lines
sound/soc/codecs/wm8731.c +6 -0
index 76b4361..5ecc05a 100644
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
+#include <linux/of_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -607,6 +608,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
 	.num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
 };
 
+static const struct of_device_id wm8731_of_match[] = {
+	{ .compatible = "wlf,wm8731", },
+	{ }
+};
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8731_spi_probe(struct spi_device *spi)
 {

sound/soc/codecs/wm8731.c static int __devexit wm8731_spi_remove(struct spi_device *spi) · line 643

Quoted 4 lines
sound/soc/codecs/wm8731.c +1 -0
@@ -634,10 +640,13 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi)
 	return 0;
 }
 
+MODULE_DEVICE_TABLE(spi, wm8731_of_match);

MODULE_DEVICE_TABLE(of, wm8731_of_match);

Quoted 10 lines
sound/soc/codecs/wm8731.c +2 -0
+
 static struct spi_driver wm8731_spi_driver = {
 	.driver = {
 		.name	= "wm8731",
 		.owner	= THIS_MODULE,
+		.of_match_table = wm8731_of_match,
 	},
 	.probe		= wm8731_spi_probe,
 	.remove		= __devexit_p(wm8731_spi_remove),

sound/soc/codecs/wm8731.c static const struct i2c_device_id wm8731_i2c_id[] = { · line 691

Quoted 5 lines
sound/soc/codecs/wm8731.c +2 -0
@@ -678,10 +687,13 @@ static const struct i2c_device_id wm8731_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id);
 
+MODULE_DEVICE_TABLE(i2c, wm8731_of_match);
+

And this line can be dropped.

i2c module info is separate from i2c and spi tables (although there may be some breakage here that need to be looked at. Right now I don't think the OF device ids get exported to udev for non-platform_devices. It needs some investigation.)

Quoted 15 lines
sound/soc/codecs/wm8731.c +1 -0
 static struct i2c_driver wm8731_i2c_driver = {
 	.driver = {
 		.name = "wm8731",
 		.owner = THIS_MODULE,
+		.of_match_table = wm8731_of_match,
 	},
 	.probe =    wm8731_i2c_probe,
 	.remove =   __devexit_p(wm8731_i2c_remove),
Signature · 6 lines
1.7.5.4

_______________________________________________
devicetree-discuss mailing list
[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss