Skip to contentSkip to conversation

ASoC: WM8903: Add of_match_table

PATCH Applied Stephen Warren 2 participants 2 messages Dec 6, 2011 – Dec 7, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: WM8903: Add of_match_table

This allows the device to be matched against the device tree using the compatible flag directly, as is standard, rather than falling back to matching .id_table against the non-vendor portion of the first compatible property value.

---
 sound/soc/codecs/wm8903.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8903.c +7 -0
index adfbefa..7a14210 100644
@@ -2205,6 +2205,12 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client)
 	return 0;
 }
 
+static const struct of_device_id wm8903_of_match[] = {
+	{ .compatible = "wlf,wm8903", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, wm8903_of_match);
+
 static const struct i2c_device_id wm8903_i2c_id[] = {
 	{ "wm8903", 0 },
 	{ }
@@ -2215,6 +2221,7 @@ static struct i2c_driver wm8903_i2c_driver = {
 	.driver = {
 		.name = "wm8903",
 		.owner = THIS_MODULE,
+		.of_match_table = wm8903_of_match,
 	},
 	.probe =    wm8903_i2c_probe,
 	.remove =   __devexit_p(wm8903_i2c_remove),
Signature · 1 line
1.7.0.4
Applied
#1 lore raw
Quoted 4 lines · Stephen Warren

This allows the device to be matched against the device tree using the compatible flag directly, as is standard, rather than falling back to matching .id_table against the non-vendor portion of the first compatible property value.

Applied, thanks.