summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-06-10 15:40:49 +0200
committerTakashi Iwai <tiwai@suse.de>2020-06-10 15:40:49 +0200
commita4f55d927d33accd6eb535ce0db031e2df47714a (patch)
tree658bd5888350934590cc37157cc60a06eb7ce693 /Documentation
parent951e2736f4b11b58dc44d41964fa17c3527d882a (diff)
parent44ce45f866c1606f03a411fb2d2c0db4626403a6 (diff)
downloadlinux-a4f55d927d33accd6eb535ce0db031e2df47714a.tar.bz2
Merge tag 'asoc-fix-v5.8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.8 A small pile of fixes that came in during the merge window, the DPCM fixes from Pierre are the most notable thing here.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/sound/tdm-slot.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/tdm-slot.txt b/Documentation/devicetree/bindings/sound/tdm-slot.txt
index 34cf70e2cbc4..4bb513ae62fc 100644
--- a/Documentation/devicetree/bindings/sound/tdm-slot.txt
+++ b/Documentation/devicetree/bindings/sound/tdm-slot.txt
@@ -14,8 +14,8 @@ For instance:
dai-tdm-slot-tx-mask = <0 1>;
dai-tdm-slot-rx-mask = <1 0>;
-And for each spcified driver, there could be one .of_xlate_tdm_slot_mask()
-to specify a explicit mapping of the channels and the slots. If it's absent
+And for each specified driver, there could be one .of_xlate_tdm_slot_mask()
+to specify an explicit mapping of the channels and the slots. If it's absent
the default snd_soc_of_xlate_tdm_slot_mask() will be used to generating the
tx and rx masks.