Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284543
b: refs/heads/master
c: 35ca984
h: refs/heads/master
i:
  284541: a7d755e
  284539: b447346
  284535: f82d299
  284527: dd009a2
  284511: 2c65e0e
  284479: dd516ab
  284415: c7a42c4
v: v3
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Jan 8, 2012
1 parent c3d3e3e commit 8191fd3
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b46a36c0e0adc92c8be2c8a6fa68d979f6eee124
refs/heads/master: 35ca98423a4c61decc20cd1d1e78a7fd7111e4db
18 changes: 18 additions & 0 deletions trunk/Documentation/devicetree/bindings/sound/wm8994.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
WM1811/WM8994/WM8958 audio CODEC

These devices support both I2C and SPI (configured with pin strapping
on the board).

Required properties:

- compatible : "wlf,wm1811", "wlf,wm8994", "wlf,wm8958"

- reg : the I2C address of the device for I2C, the chip select
number for SPI.

Example:

codec: wm8994@1a {
compatible = "wlf,wm8994";
reg = <0x1a>;
};
9 changes: 9 additions & 0 deletions trunk/drivers/mfd/wm8994-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,14 @@ static void wm8994_device_exit(struct wm8994 *wm8994)
regmap_exit(wm8994->regmap);
}

static const struct of_device_id wm8994_of_match[] = {
{ .compatible = "wlf,wm1811", },
{ .compatible = "wlf,wm8994", },
{ .compatible = "wlf,wm8958", },
{ }
};
MODULE_DEVICE_TABLE(of, wm8994_of_match);

static int wm8994_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
Expand Down Expand Up @@ -633,6 +641,7 @@ static struct i2c_driver wm8994_i2c_driver = {
.name = "wm8994",
.owner = THIS_MODULE,
.pm = &wm8994_pm_ops,
.of_match_table = wm8994_of_match,
},
.probe = wm8994_i2c_probe,
.remove = wm8994_i2c_remove,
Expand Down

0 comments on commit 8191fd3

Please sign in to comment.