diff mbox

[1/3] ASoC: codecs: wm8904: add dt ids table

Message ID 1418267681-4091-1-git-send-email-voice.shen@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Bo Shen Dec. 11, 2014, 3:14 a.m. UTC 
From: Alexander Morozov <linux@meltdown.ru>

Signed-off-by: Alexander Morozov <linux@meltdown.ru>
Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

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

Comments

Mark Brown Dec. 12, 2014, 1:23 p.m. UTC | #1 
On Thu, Dec 11, 2014 at 11:14:39AM +0800, Bo Shen wrote:

> +static const struct of_device_id wm8904_of_match[] = {
> +	{ .compatible = "wlf,wm8904", },
> +	{ .compatible = "wlf,wm8912", },
> +	{ .compatible = "wlf,wm8918", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(of, wm8904_of_match);
> +
>  static struct i2c_driver wm8904_i2c_driver = {
>  	.driver = {
>  		.name = "wm8904",
>  		.owner = THIS_MODULE,
> +		.of_match_table = wm8904_of_match,

I'm not seeing anything here that ensures that devtype is set correctly
when probing using the OF IDs - currently we rely on i2c->driver_data.
Bo Shen Dec. 15, 2014, 3:28 a.m. UTC | #2 
Hi Mark,

On 12/12/2014 09:23 PM, Mark Brown wrote:
> On Thu, Dec 11, 2014 at 11:14:39AM +0800, Bo Shen wrote:
>
>> +static const struct of_device_id wm8904_of_match[] = {
>> +	{ .compatible = "wlf,wm8904", },
>> +	{ .compatible = "wlf,wm8912", },
>> +	{ .compatible = "wlf,wm8918", },
>> +	{ }
>> +};
>> +MODULE_DEVICE_TABLE(of, wm8904_of_match);
>> +
>>   static struct i2c_driver wm8904_i2c_driver = {
>>   	.driver = {
>>   		.name = "wm8904",
>>   		.owner = THIS_MODULE,
>> +		.of_match_table = wm8904_of_match,
>
> I'm not seeing anything here that ensures that devtype is set correctly
> when probing using the OF IDs - currently we rely on i2c->driver_data.
>

I will add it in v2 patch.
Thanks.

Best Regards,
Bo Shen
diff mbox

Patch

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 4d2d2b1..23831a5 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2255,10 +2255,19 @@  static const struct i2c_device_id wm8904_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id);
 
+static const struct of_device_id wm8904_of_match[] = {
+	{ .compatible = "wlf,wm8904", },
+	{ .compatible = "wlf,wm8912", },
+	{ .compatible = "wlf,wm8918", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, wm8904_of_match);
+
 static struct i2c_driver wm8904_i2c_driver = {
 	.driver = {
 		.name = "wm8904",
 		.owner = THIS_MODULE,
+		.of_match_table = wm8904_of_match,
 	},
 	.probe =    wm8904_i2c_probe,
 	.remove =   wm8904_i2c_remove,