diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 12:24:35 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 12:24:35 +0300 |
| commit | 6afff9e0607933afb948d9e60c684b669fe4928c (patch) | |
| tree | 762ef7ff39912df795ff98e7d1780c51fd9cbee4 /Documentation/devicetree/bindings/sound/simple-card.txt | |
| parent | 71d8c2d78351a3c2fe6b432f1d5efd78327c97d8 (diff) | |
| parent | 85a4bfd895778960dc2d655087ac7ff442b6ab9e (diff) | |
| download | linux-6afff9e0607933afb948d9e60c684b669fe4928c.tar.xz | |
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
Diffstat (limited to 'Documentation/devicetree/bindings/sound/simple-card.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/simple-card.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt index 73bf314f7240..cf3979eb3578 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -16,7 +16,8 @@ Optional properties: connection's sink, the second being the connection's source. - simple-audio-card,mclk-fs : Multiplication factor between stream rate and codec - mclk. + mclk. When defined, mclk-fs property defined in + dai-link sub nodes are ignored. - simple-audio-card,hp-det-gpio : Reference to GPIO that signals when headphones are attached. - simple-audio-card,mic-det-gpio : Reference to GPIO that signals when @@ -55,6 +56,9 @@ Optional dai-link subnode properties: dai-link uses bit clock inversion. - frame-inversion : bool property. Add this if the dai-link uses frame clock inversion. +- mclk-fs : Multiplication factor between stream + rate and codec mclk, applied only for + the dai-link. For backward compatibility the frame-master and bitclock-master properties can be used as booleans in codec subnode to indicate if the |