diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-10-24 07:57:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-10-24 07:57:39 +0200 |
| commit | c9f7a144e7e3effd49303bfc58c07cc10ab2d573 (patch) | |
| tree | 0dcc442e9c3c7306cd2f9c1644d3f55e0061f8c1 /Documentation | |
| parent | e3ea2757c312e51bbf62ebc434a6f7df1e3a201f (diff) | |
| parent | db7e59e6a39a4d3d54ca8197c796557e6d480b0d (diff) | |
| download | linux-c9f7a144e7e3effd49303bfc58c07cc10ab2d573.tar.gz linux-c9f7a144e7e3effd49303bfc58c07cc10ab2d573.tar.bz2 linux-c9f7a144e7e3effd49303bfc58c07cc10ab2d573.zip | |
Merge tag 'asoc-fix-v6.12-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.12
An uncomfortably large set of fixes due to me not getting round to
sending them for longer than I should due to travel and illness. This
is mostly smaller driver specific changes, but there are a couple of
generic changes:
- Bumping the minimal topology ABI we check for during validation, the
code had support for v4 removed previously but the update of the
define used for initial validation was missed.
- Fix the assumption that DAPM structs will be embedded in a component
which isn't true for card widgets when doing name comparisons, though
fortunately this is rarely triggered.
We've pulled in one Soundwire fix which was part of a larger series
fixing cleanup issues in on Intel Soundwire systems.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml index ab3206ffa4af..beef193aaaeb 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml @@ -102,21 +102,21 @@ properties: default: 2 interrupts: - oneOf: - - minItems: 1 - items: - - description: TX interrupt - - description: RX interrupt - - items: - - description: common/combined interrupt + minItems: 1 + maxItems: 2 interrupt-names: oneOf: - - minItems: 1 + - description: TX interrupt + const: tx + - description: RX interrupt + const: rx + - description: TX and RX interrupts items: - const: tx - const: rx - - const: common + - description: Common/combined interrupt + const: common fck_parent: $ref: /schemas/types.yaml#/definitions/string |