summaryrefslogtreecommitdiffstats
path: root/Documentation/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-07-11 15:51:01 +0100
committerMark Brown <broonie@kernel.org>2022-07-11 15:51:01 +0100
commit39c5c44fc451c083908e77c3b2762fae2bf8acca (patch)
tree6e3c05c56e48fa9d29ad1f89614e9f0ef48459d4 /Documentation/sound/soc
parenteaa27e7fe43f16fe587c3e93fd5c25ce86be3c43 (diff)
parent26b9f2fa7b1c6aba6fa9b83274a3e54868f69562 (diff)
downloadlinux-stable-39c5c44fc451c083908e77c3b2762fae2bf8acca.tar.gz
linux-stable-39c5c44fc451c083908e77c3b2762fae2bf8acca.tar.bz2
linux-stable-39c5c44fc451c083908e77c3b2762fae2bf8acca.zip
ASoC: Merge up fixes
Needed for the Rockchip driver.
Diffstat (limited to 'Documentation/sound/soc')
-rw-r--r--Documentation/sound/soc/dai.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/soc/dai.rst b/Documentation/sound/soc/dai.rst
index 009b07e5a0f3..bf8431386d26 100644
--- a/Documentation/sound/soc/dai.rst
+++ b/Documentation/sound/soc/dai.rst
@@ -10,7 +10,7 @@ AC97
====
AC97 is a five wire interface commonly found on many PC sound cards. It is
-now also popular in many portable devices. This DAI has a reset line and time
+now also popular in many portable devices. This DAI has a RESET line and time
multiplexes its data on its SDATA_OUT (playback) and SDATA_IN (capture) lines.
The bit clock (BCLK) is always driven by the CODEC (usually 12.288MHz) and the
frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97