diff options
| author | Mark Brown <broonie@kernel.org> | 2022-07-11 15:51:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-07-11 15:51:01 +0100 |
| commit | 39c5c44fc451c083908e77c3b2762fae2bf8acca (patch) | |
| tree | 6e3c05c56e48fa9d29ad1f89614e9f0ef48459d4 /Documentation | |
| parent | eaa27e7fe43f16fe587c3e93fd5c25ce86be3c43 (diff) | |
| parent | 26b9f2fa7b1c6aba6fa9b83274a3e54868f69562 (diff) | |
| download | linux-39c5c44fc451c083908e77c3b2762fae2bf8acca.tar.bz2 | |
ASoC: Merge up fixes
Needed for the Rockchip driver.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml | 8 | ||||
| -rw-r--r-- | Documentation/sound/soc/dai.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml index e9a533080b32..ef18a572a1ff 100644 --- a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml @@ -25,12 +25,12 @@ properties: - qcom,sc7280-lpass-cpu reg: - minItems: 2 + minItems: 1 maxItems: 6 description: LPAIF core registers reg-names: - minItems: 2 + minItems: 1 maxItems: 6 clocks: @@ -42,12 +42,12 @@ properties: maxItems: 10 interrupts: - minItems: 2 + minItems: 1 maxItems: 4 description: LPAIF DMA buffer interrupt interrupt-names: - minItems: 2 + minItems: 1 maxItems: 4 qcom,adsp: 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 |