diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-09-07 15:10:36 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-09-07 15:10:36 +0300 |
| commit | ecc8b4d0b6e19031733f28537971f8c5088dada2 (patch) | |
| tree | 1d6f6f539a98a42a3dedb014c02ec2542625add4 /Documentation | |
| parent | e43252db7e207a2e194e6a4883a43a31a776a968 (diff) | |
| parent | cfff2a7794d23b03a3ddedd318bf1df1876c598f (diff) | |
| download | linux-ecc8b4d0b6e19031733f28537971f8c5088dada2.tar.xz | |
Merge tag 'asoc-fix-v6.6-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.6
A bunch of fixes and new IDs that came in since the initial pull request
- all driver specific and nothing too exciting.
There's a trivial conflict in the AMD driver ID table due to the last
v6.5 fixes not having been merged up.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/fsl,easrc.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/fsl,easrc.yaml b/Documentation/devicetree/bindings/sound/fsl,easrc.yaml index bdde68a1059c..a680d7aff237 100644 --- a/Documentation/devicetree/bindings/sound/fsl,easrc.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,easrc.yaml @@ -14,7 +14,13 @@ properties: pattern: "^easrc@.*" compatible: - const: fsl,imx8mn-easrc + oneOf: + - enum: + - fsl,imx8mn-easrc + - items: + - enum: + - fsl,imx8mp-easrc + - const: fsl,imx8mn-easrc reg: maxItems: 1 |