diff options
| author | Dan Murphy <DMurphy@ti.com> | 2014-11-10 06:33:37 -0600 |
|---|---|---|
| committer | Dan Murphy <DMurphy@ti.com> | 2014-11-10 06:33:37 -0600 |
| commit | faf72fe2799d05dda704cdf313cba0255714f7a1 (patch) | |
| tree | c84cb86bd52e41e1a475a7304d6363290053fc66 /Documentation | |
| parent | b46b72e9e879961687300668cdfeeb003188bc7e (diff) | |
| parent | 2f9e453fe0f1b3cbd57276344a8cd800ce4c7c45 (diff) | |
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-3.14.y
TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y
* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree: (26 commits)
ti_fragments: audio_display: Make DRA7-EVM audio a builtin
ASoC: davinci-mcasp: Add overrun/underrun event handling
ASoC: davinci-mcasp: Fix rx format when more bclk is used on the bus
ASoC: davinci-mcasp: Symmetric sample bits for IIS mode
ASoC: davinci-mcasp: Active slots depend on active serializers
ASoC: davinci-mcasp: Place constraint on number of channels
ASoC: davinci-mcasp: Validate tdm_slots parameter at probe time
ASoC: tlv320aic3x: Add TDM support
ASoC: tlv320aic3x: Add output driver pop reduction controls
ARM: DTS: dra72-evm: Correct the clock name used by the sound node
ARM: DTS: dra72-evm: Complete the audio routes
ARM: DTS: dra7-evm: Correct the clock name used by the sound node
ARM: DTS: dra7-evm: Complete the audio routes
ARM: DTS: dra72-evm: Fix McASP3 num of serializers
ARM: DTS: dra7-evm: Fix McASP3 num of serializers
ASoC: davinci-mcasp: Move the AFIFO related code under start_tx/rx functions
ASoC: davinci-mcasp: When stopping TX/RX stop the AFIFO as the last step
ASoC: davinci-mcasp: Correct RX start sequence
ASoC: davinci-mcasp: Correct TX start sequence
ti_fragments: audio_display: Add more audio options to be enabled
...
Signed-off-by: Dan Murphy <DMurphy@ti.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt index 569b26c4a81..05121c20ae5 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt @@ -32,7 +32,7 @@ Optional properties: - rx-num-evt : FIFO levels. - sram-size-playback : size of sram to be allocated during playback - sram-size-capture : size of sram to be allocated during capture -- interrupts : Interrupt numbers for McASP, currently not used by the driver +- interrupts : Interrupt numbers for McASP - interrupt-names : Known interrupt names are "tx" and "rx" - pinctrl-0: Should specify pin control group used for this controller. - pinctrl-names: Should contain only one value - "default", for more details |