Commit 5ddff831 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

ASoC: dt-bindings: samsung,odroid: 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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810063300.20151-5-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e1d77644
...@@ -10,6 +10,9 @@ maintainers: ...@@ -10,6 +10,9 @@ maintainers:
- Krzysztof Kozlowski <krzk@kernel.org> - Krzysztof Kozlowski <krzk@kernel.org>
- Sylwester Nawrocki <s.nawrocki@samsung.com> - Sylwester Nawrocki <s.nawrocki@samsung.com>
allOf:
- $ref: sound-card-common.yaml#
properties: properties:
compatible: compatible:
oneOf: oneOf:
...@@ -24,10 +27,6 @@ properties: ...@@ -24,10 +27,6 @@ properties:
- const: samsung,odroid-xu4-audio - const: samsung,odroid-xu4-audio
deprecated: true deprecated: true
model:
$ref: /schemas/types.yaml#/definitions/string
description: The user-visible name of this sound complex.
assigned-clock-parents: true assigned-clock-parents: true
assigned-clock-rates: true assigned-clock-rates: true
assigned-clocks: true assigned-clocks: true
...@@ -52,6 +51,7 @@ properties: ...@@ -52,6 +51,7 @@ properties:
samsung,audio-routing: samsung,audio-routing:
$ref: /schemas/types.yaml#/definitions/non-unique-string-array $ref: /schemas/types.yaml#/definitions/non-unique-string-array
deprecated: true
description: | description: |
List of the connections between audio List of the connections between audio
components; each entry is a pair of strings, the first being the components; each entry is a pair of strings, the first being the
...@@ -61,6 +61,7 @@ properties: ...@@ -61,6 +61,7 @@ properties:
For Odroid X2: "Headphone Jack", "Mic Jack", "DMIC" For Odroid X2: "Headphone Jack", "Mic Jack", "DMIC"
For Odroid U3, XU3: "Headphone Jack", "Speakers" For Odroid U3, XU3: "Headphone Jack", "Speakers"
For Odroid XU4: no entries For Odroid XU4: no entries
Deprecated, use audio-routing.
samsung,audio-widgets: samsung,audio-widgets:
$ref: /schemas/types.yaml#/definitions/non-unique-string-array $ref: /schemas/types.yaml#/definitions/non-unique-string-array
...@@ -70,18 +71,17 @@ properties: ...@@ -70,18 +71,17 @@ properties:
required: required:
- compatible - compatible
- model
- cpu - cpu
- codec - codec
additionalProperties: false unevaluatedProperties: false
examples: examples:
- | - |
sound { sound {
compatible = "hardkernel,odroid-xu3-audio"; compatible = "hardkernel,odroid-xu3-audio";
model = "Odroid-XU3"; model = "Odroid-XU3";
samsung,audio-routing = audio-routing =
"Headphone Jack", "HPL", "Headphone Jack", "HPL",
"Headphone Jack", "HPR", "Headphone Jack", "HPR",
"IN1", "Mic Jack", "IN1", "Mic Jack",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment