Skip to content

Commit 631e9d4

Browse files
krzkbroonie
authored andcommitted
ASoC: dt-bindings: samsung,tm2: use common sound card
Reference the common sound card properties and deprecate the custom "samsung,audio-routing" in favor of generic one. This allows to remove "model" property and make the binding closer to other sounds cards. Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20230810063300.20151-6-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 5ddff83 commit 631e9d4

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

Documentation/devicetree/bindings/sound/samsung,tm2.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ maintainers:
1010
- Krzysztof Kozlowski <krzk@kernel.org>
1111
- Sylwester Nawrocki <s.nawrocki@samsung.com>
1212

13+
allOf:
14+
- $ref: sound-card-common.yaml#
15+
1316
properties:
1417
compatible:
1518
const: samsung,tm2-audio
@@ -32,6 +35,8 @@ properties:
3235
being the connection's source; valid names for sources and sinks are the
3336
WM5110's and MAX98504's pins and the jacks on the board: HP, SPK, Main
3437
Mic, Sub Mic, Third Mic, Headset Mic.
38+
Deprecated, use audio-routing.
39+
deprecated: true
3540
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
3641

3742
i2s-controller:
@@ -44,20 +49,15 @@ properties:
4449
mic-bias-gpios:
4550
description: GPIO pin that enables the Main Mic bias regulator.
4651

47-
model:
48-
description: The user-visible name of this sound complex.
49-
$ref: /schemas/types.yaml#/definitions/string
50-
5152
required:
5253
- compatible
5354
- audio-amplifier
5455
- audio-codec
55-
- samsung,audio-routing
56+
- audio-routing
5657
- i2s-controller
5758
- mic-bias-gpios
58-
- model
5959

60-
additionalProperties: false
60+
unevaluatedProperties: false
6161

6262
examples:
6363
- |
@@ -70,7 +70,7 @@ examples:
7070
audio-amplifier = <&max98504>;
7171
mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>;
7272
model = "wm5110";
73-
samsung,audio-routing = "HP", "HPOUT1L",
73+
audio-routing = "HP", "HPOUT1L",
7474
"HP", "HPOUT1R",
7575
"SPK", "SPKOUT",
7676
"SPKOUT", "HPOUT2L",

0 commit comments

Comments
 (0)