diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 13:07:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 13:07:06 -0400 |
| commit | 1c2f95480648ed7326ab2288ca0e2d35551db4be (patch) | |
| tree | fa69d267423242eaad195e60c74570152e6c3d84 /Documentation | |
| parent | 59068e369b6a2a0a15b93624887525d9ec0f36e5 (diff) | |
| parent | e9e7183fd2677aca24e90ca1556d4afe7436d42d (diff) | |
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound sound fixes from Takashi Iwai:
"As good as nothing exciting here; just a few trivial fixes for various
ASoC stuff."
* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: omap-pcm: Free dma buffers in case of error.
ASoC: s3c2412-i2s: Fix dai registration
ASoC: wm8350: Don't use locally allocated codec struct
ASoC: tlv312aic23: unbreak resume
ASoC: bf5xx-ssm2602: Set DAI format
ASoC: core: check of_property_count_strings failure
ASoC: dt: sgtl5000.txt: Add description for 'reg' field
ASoC: wm_hubs: Make sure we don't disable differential line outputs
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/sgtl5000.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 2c3cd413f042..9cc44449508d 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible : "fsl,sgtl5000". | 4 | - compatible : "fsl,sgtl5000". |
| 5 | 5 | ||
| 6 | - reg : the I2C address of the device | ||
| 7 | |||
| 6 | Example: | 8 | Example: |
| 7 | 9 | ||
| 8 | codec: sgtl5000@0a { | 10 | codec: sgtl5000@0a { |