diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 12:19:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 12:19:44 -0400 |
commit | e7990d45bb88c2f0565b5ee4c32eefe81653faff (patch) | |
tree | 852ab6988b7226083fefa0e0e851dbff0e7ec7f2 /Documentation/devicetree | |
parent | 190a3998be3ede25d6145e187d6d321f504d28fb (diff) | |
parent | a5065eb6da55b226661456e6a7435f605df98111 (diff) |
Merge tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Here is a bunch of small fixes that have been collected since the
previous pull request. In addition to various misc fixes, the
following are included:
- HD-audio quirks for Dell, HP, Chromebook, and ALC28x codecs
- HD-audio AMD HDMI regression fix
- Continued PM support/fixes for ice1712 driver
- Multiplatform fixes for ASoC samsung drivers
- Addition of device id tables to a few ASoC drivers
- Bit clock polarity config and error flag fixes in ASoC fsl_sai"
* tag 'sound-fix-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
ALSA: usb-audio: Suppress repetitive debug messages from retire_playback_urb()
ALSA: hda - Make full_reset boolean
ALSA: hda - add headset mic detect quirk for a Dell laptop
sound: dmasound: use module_platform_driver_probe()
ALSA: au1x00: use module_platform_driver()
ALSA: hda - Use runtime helper to check active state.
ALSA: ice1712: Fix boundary checks in PCM pointer ops
ASoC: davinci-mcasp: Fix bit clock polarity settings
ASoC: samsung: Fix build on multiplatform
ASoC: fsl_sai: Fix Bit Clock Polarity configurations
ALSA: hda - Do not assign streams in reverse order
ALSA: hda/realtek - Add eapd shutup to ALC283
ALSA: hda/realtek - Change model name alias for ChromeOS
ASoC: da732x: Print correct major id
ALSA: hda/realtek - Improve HP depop when system change power state on Chromebook
ASoC: cs42l52: Fix mask for REVID
sound/oss: Remove uncompilable DBG macro use
ALSA: ice1712: Save/restore routing and rate registers
ALSA: ice1712: restore AK4xxx volumes on resume
ASoC: alc56(23|32): fix undefined return value of probing code
...
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/sound/fsl,ssi.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/sound/fsl,ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt index b93e9a91e30e..3aa4a8f528f4 100644 --- a/Documentation/devicetree/bindings/sound/fsl,ssi.txt +++ b/Documentation/devicetree/bindings/sound/fsl,ssi.txt | |||
@@ -20,15 +20,6 @@ Required properties: | |||
20 | have. | 20 | have. |
21 | - interrupt-parent: The phandle for the interrupt controller that | 21 | - interrupt-parent: The phandle for the interrupt controller that |
22 | services interrupts for this device. | 22 | services interrupts for this device. |
23 | - fsl,mode: The operating mode for the SSI interface. | ||
24 | "i2s-slave" - I2S mode, SSI is clock slave | ||
25 | "i2s-master" - I2S mode, SSI is clock master | ||
26 | "lj-slave" - left-justified mode, SSI is clock slave | ||
27 | "lj-master" - l.j. mode, SSI is clock master | ||
28 | "rj-slave" - right-justified mode, SSI is clock slave | ||
29 | "rj-master" - r.j., SSI is clock master | ||
30 | "ac97-slave" - AC97 mode, SSI is clock slave | ||
31 | "ac97-master" - AC97 mode, SSI is clock master | ||
32 | - fsl,playback-dma: Phandle to a node for the DMA channel to use for | 23 | - fsl,playback-dma: Phandle to a node for the DMA channel to use for |
33 | playback of audio. This is typically dictated by SOC | 24 | playback of audio. This is typically dictated by SOC |
34 | design. See the notes below. | 25 | design. See the notes below. |
@@ -47,6 +38,9 @@ Required properties: | |||
47 | be connected together, and SRFS and STFS be connected | 38 | be connected together, and SRFS and STFS be connected |
48 | together. This would still allow different sample sizes, | 39 | together. This would still allow different sample sizes, |
49 | but not different sample rates. | 40 | but not different sample rates. |
41 | - clocks: "ipg" - Required clock for the SSI unit | ||
42 | "baud" - Required clock for SSI master mode. Otherwise this | ||
43 | clock is not used | ||
50 | 44 | ||
51 | Required are also ac97 link bindings if ac97 is used. See | 45 | Required are also ac97 link bindings if ac97 is used. See |
52 | Documentation/devicetree/bindings/sound/soc-ac97link.txt for the necessary | 46 | Documentation/devicetree/bindings/sound/soc-ac97link.txt for the necessary |
@@ -64,6 +58,15 @@ Optional properties: | |||
64 | Documentation/devicetree/bindings/dma/dma.txt. | 58 | Documentation/devicetree/bindings/dma/dma.txt. |
65 | - dma-names: Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq | 59 | - dma-names: Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq |
66 | is not defined. | 60 | is not defined. |
61 | - fsl,mode: The operating mode for the SSI interface. | ||
62 | "i2s-slave" - I2S mode, SSI is clock slave | ||
63 | "i2s-master" - I2S mode, SSI is clock master | ||
64 | "lj-slave" - left-justified mode, SSI is clock slave | ||
65 | "lj-master" - l.j. mode, SSI is clock master | ||
66 | "rj-slave" - right-justified mode, SSI is clock slave | ||
67 | "rj-master" - r.j., SSI is clock master | ||
68 | "ac97-slave" - AC97 mode, SSI is clock slave | ||
69 | "ac97-master" - AC97 mode, SSI is clock master | ||
67 | 70 | ||
68 | Child 'codec' node required properties: | 71 | Child 'codec' node required properties: |
69 | - compatible: Compatible list, contains the name of the codec | 72 | - compatible: Compatible list, contains the name of the codec |