diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-27 13:45:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-27 13:45:48 +0100 |
| commit | ad2ab00c991298b55108b0c3ce21adb3a4b24ce5 (patch) | |
| tree | ffb7135b6e28d556d86a4a96238767b8e59d0407 /Documentation | |
| parent | e61249bb8a67a9f31a52f91259569aa44e9f6ca2 (diff) | |
| parent | 27becea06e73c96b825ecddd8b3a59642364514a (diff) | |
| download | linux-0-day-ad2ab00c991298b55108b0c3ce21adb3a4b24ce5.tar.gz linux-0-day-ad2ab00c991298b55108b0c3ce21adb3a4b24ce5.tar.xz | |
Merge remote-tracking branch 'asoc/topic/mtk' into asoc-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt | 5 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mt8173-rt5650.txt | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt index f205ce9e31dd5..ac28cdb4910ef 100644 --- a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt @@ -1,15 +1,16 @@ -MT8173 with RT5650 RT5676 CODECS +MT8173 with RT5650 RT5676 CODECS and HDMI via I2S Required properties: - compatible : "mediatek,mt8173-rt5650-rt5676" - mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs + and of the hdmi encoder node - mediatek,platform: the phandle of MT8173 ASoC platform Example: sound { compatible = "mediatek,mt8173-rt5650-rt5676"; - mediatek,audio-codec = <&rt5650 &rt5676>; + mediatek,audio-codec = <&rt5650 &rt5676 &hdmi0>; mediatek,platform = <&afe>; }; diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt index fe5a5ef1714d7..5bfa6b60530bd 100644 --- a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt @@ -5,11 +5,21 @@ Required properties: - mediatek,audio-codec: the phandles of rt5650 codecs - mediatek,platform: the phandle of MT8173 ASoC platform +Optional subnodes: +- codec-capture : the subnode of rt5650 codec capture +Required codec-capture subnode properties: +- sound-dai: audio codec dai name on capture path + <&rt5650 0> : Default setting. Connect rt5650 I2S1 for capture. (dai_name = rt5645-aif1) + <&rt5650 1> : Connect rt5650 I2S2 for capture. (dai_name = rt5645-aif2) + Example: sound { compatible = "mediatek,mt8173-rt5650"; mediatek,audio-codec = <&rt5650>; mediatek,platform = <&afe>; + codec-capture { + sound-dai = <&rt5650 1>; + }; }; |