[alsa-devel] [PATCH 1/3] ASoC: codecs: wm8904: add dt ids table
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(+)
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,
From: Alexander Morozov linux@meltdown.ru
Using the wm8904 device tree compatible string.
Signed-off-by: Alexander Morozov linux@meltdown.ru Signed-off-by: Bo Shen voice.shen@atmel.com ---
arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi index 49c10d3..2a1aa58 100644 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi @@ -45,7 +45,7 @@ */ i2c0: i2c@f0014000 { wm8904: wm8904@1a { - compatible = "wm8904"; + compatible = "wlf,wm8904"; reg = <0x1a>; clocks = <&pck0>; clock-names = "mclk";
Using the device tree ids for wm8904 codec.
Signed-off-by: Bo Shen voice.shen@atmel.com ---
arch/arm/boot/dts/at91sam9n12ek.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index 13bb24e..9575c0d 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -54,7 +54,7 @@ status = "okay";
wm8904: codec@1a { - compatible = "wm8904"; + compatible = "wlf,wm8904"; reg = <0x1a>; clocks = <&pck0>; clock-names = "mclk";
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.
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
participants (2)
-
Bo Shen -
Mark Brown