Unverified Commit d63cff2b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: dt-bindings: samsung,aries-wm8994: 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-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 34e7bf1a
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Samsung Aries audio complex with WM8994 codec
maintainers:
  - Jonathan Bakker <xc-racer2@live.ca>

allOf:
  - $ref: sound-card-common.yaml#

properties:
  compatible:
    enum:
@@ -17,10 +20,6 @@ properties:
      # Without FM radio and modem slave
      - samsung,fascinate4g-wm8994

  model:
    $ref: /schemas/types.yaml#/definitions/string
    description: The user-visible name of this sound complex.

  cpu:
    type: object
    additionalProperties: false
@@ -46,6 +45,7 @@ properties:

  samsung,audio-routing:
    $ref: /schemas/types.yaml#/definitions/non-unique-string-array
    deprecated: true
    description: |
      List of the connections between audio
      components;  each entry is a pair of strings, the first being the
@@ -56,6 +56,7 @@ properties:
      or FM In
      For samsung,fascinate4g-wm8994: HP, SPK, RCV, LINE, Main Mic,
      or HeadsetMic
      Deprecated, use audio-routing.

  extcon:
    description: Extcon phandle for dock detection
@@ -87,10 +88,9 @@ properties:

required:
  - compatible
  - model
  - cpu
  - codec
  - samsung,audio-routing
  - audio-routing
  - extcon
  - main-micbias-supply
  - headset-micbias-supply
@@ -98,7 +98,7 @@ required:
  - headset-detect-gpios
  - headset-key-gpios

additionalProperties: false
unevaluatedProperties: false

examples:
  - |
@@ -121,7 +121,7 @@ examples:
        headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_HIGH>;
        headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>;

        samsung,audio-routing =
        audio-routing =
            "HP", "HPOUT1L",
            "HP", "HPOUT1R",