2014-12-15 03:31:31

by Bo Shen

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

From: Alexander Morozov <[email protected]>

Signed-off-by: Alexander Morozov <[email protected]>
[Add driver data to distinguish device type]
Signed-off-by: Bo Shen <[email protected]>
---

Changes in v2:
- Add driver data for distinguish the device capability.

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

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 4d2d2b1..6e3f175 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2255,10 +2255,32 @@ static const struct i2c_device_id wm8904_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id);

+#ifdef CONFIG_OF
+static enum wm8904_type wm8904_data = WM8904;
+static enum wm8904_type wm8912_data = WM8912;
+
+static const struct of_device_id wm8904_of_match[] = {
+ {
+ .compatible = "wlf,wm8904",
+ .data = &wm8904_data,
+ }, {
+ .compatible = "wlf,wm8912",
+ .data = &wm8912_data,
+ }, {
+ .compatible = "wlf,wm8918",
+ .data = &wm8904_data,
+ }, {
+ /* sentinel */
+ }
+};
+MODULE_DEVICE_TABLE(of, wm8904_of_match);
+#endif
+
static struct i2c_driver wm8904_i2c_driver = {
.driver = {
.name = "wm8904",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(wm8904_of_match),
},
.probe = wm8904_i2c_probe,
.remove = wm8904_i2c_remove,
--
2.1.0.24.g4109c28

2014-12-15 03:31:42

by Bo Shen

Subject: [PATCH v2 3/3] ARM: at91: at91sam9n12ek/dt: use dt ids for wm8904

Using the device tree ids for wm8904 codec.

Signed-off-by: Bo Shen <[email protected]>
---

Changes in v2: None

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";
--
2.1.0.24.g4109c28

2014-12-15 03:31:45

by Bo Shen

Subject: [PATCH v2 2/3] ARM: at91: sama5d3xek/dt: use dt ids for wm8904

From: Alexander Morozov <[email protected]>

Using the wm8904 device tree compatible string.

Signed-off-by: Alexander Morozov <[email protected]>
Signed-off-by: Bo Shen <[email protected]>
---

Changes in v2: None

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";
--
2.1.0.24.g4109c28