diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 06:17:14 -0400 |
| commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
| tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /Documentation/devicetree/bindings/sound/imx-audmux.txt | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| parent | e011143454606de70eba1db5d99454eec0017fdb (diff) | |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'Documentation/devicetree/bindings/sound/imx-audmux.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/imx-audmux.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/imx-audmux.txt b/Documentation/devicetree/bindings/sound/imx-audmux.txt index 215aa9817213..f88a00e54c63 100644 --- a/Documentation/devicetree/bindings/sound/imx-audmux.txt +++ b/Documentation/devicetree/bindings/sound/imx-audmux.txt | |||
| @@ -5,6 +5,15 @@ Required properties: | |||
| 5 | or "fsl,imx31-audmux" for the version firstly used on i.MX31. | 5 | or "fsl,imx31-audmux" for the version firstly used on i.MX31. |
| 6 | - reg : Should contain AUDMUX registers location and length | 6 | - reg : Should contain AUDMUX registers location and length |
| 7 | 7 | ||
| 8 | An initial configuration can be setup using child nodes. | ||
| 9 | |||
| 10 | Required properties of optional child nodes: | ||
| 11 | - fsl,audmux-port : Integer of the audmux port that is configured by this | ||
| 12 | child node. | ||
| 13 | - fsl,port-config : List of configuration options for the specific port. For | ||
| 14 | imx31-audmux and above, it is a list of tuples <ptcr pdcr>. For | ||
| 15 | imx21-audmux it is a list of pcr values. | ||
| 16 | |||
| 8 | Example: | 17 | Example: |
| 9 | 18 | ||
| 10 | audmux@021d8000 { | 19 | audmux@021d8000 { |