diff options
| author | Mark Brown <broonie@kernel.org> | 2023-01-18 18:33:51 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-18 18:33:51 +0300 |
| commit | 309d401452b96f23abe2572d290c51c548d9f728 (patch) | |
| tree | 28aae1adcf60a890dcf17c676b241db07bef98c1 /Documentation | |
| parent | 24b401f3e0b1ddd269969e68e947ab0a6f89b017 (diff) | |
| parent | c1619ea22d9509cfbcf5c2c1cc65563179e9dc8e (diff) | |
| download | linux-309d401452b96f23abe2572d290c51c548d9f728.tar.xz | |
ASoC: Merge up 6.2 fixes
To resolve a conflict and support further development.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml index 9d3139990237..aa23b0024c46 100644 --- a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml +++ b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml @@ -16,6 +16,7 @@ properties: compatible: enum: - mediatek,mt8186-mt6366-rt1019-rt5682s-sound + - mediatek,mt8186-mt6366-rt5682s-max98360-sound mediatek,platform: $ref: "/schemas/types.yaml#/definitions/phandle" |