ASoC: dt-bindings: qcom,sm8250: add SDM845 sound

The Qualcomm SDM845 sound card bindings are almost the same as SM8250,
except "pin-switches" and "widgets" properties.  These were not
documented in SDM845 text bindings but are actually valid for SDM845.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20220705182802.775803-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/qcom,sdm845.txt b/Documentation/devicetree/bindings/sound/qcom,sdm845.txt
deleted file mode 100644 (file)
index de4c604..0000000
--- a/Documentation/devicetree/bindings/sound/qcom,sdm845.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-* Qualcomm Technologies Inc. SDM845 ASoC sound card driver
-
-This binding describes the SDM845 sound card, which uses qdsp for audio.
-
-- compatible:
-       Usage: required
-       Value type: <stringlist>
-       Definition: must be one of this
-                       "qcom,sdm845-sndcard"
-                       "qcom,db845c-sndcard"
-                       "lenovo,yoga-c630-sndcard"
-
-- audio-routing:
-       Usage: Optional
-       Value type: <stringlist>
-       Definition:  A list of the connections between audio components.
-                 Each entry is a pair of strings, the first being the
-                 connection's sink, the second being the connection's
-                 source. Valid names could be power supplies, MicBias
-                 of codec and the jacks on the board.
-
-- model:
-       Usage: required
-       Value type: <stringlist>
-       Definition: The user-visible name of this sound card.
-
-- aux-devs
-       Usage: optional
-       Value type: <array of phandles>
-       Definition: A list of phandles for auxiliary devices (e.g. analog
-                   amplifiers) that do not appear directly within the DAI
-                   links. Should be connected to another audio component
-                   using "audio-routing".
-
-= dailinks
-Each subnode of sndcard represents either a dailink, and subnodes of each
-dailinks would be cpu/codec/platform dais.
-
-- link-name:
-       Usage: required
-       Value type: <string>
-       Definition: User friendly name for dai link
-
-= CPU, PLATFORM, CODEC dais subnodes
-- cpu:
-       Usage: required
-       Value type: <subnode>
-       Definition: cpu dai sub-node
-
-- codec:
-       Usage: required
-       Value type: <subnode>
-       Definition: codec dai sub-node
-
-- platform:
-       Usage: Optional
-       Value type: <subnode>
-       Definition: platform dai sub-node
-
-- sound-dai:
-       Usage: required
-       Value type: <phandle>
-       Definition: dai phandle/s and port of CPU/CODEC/PLATFORM node.
-
-Example:
-
-audio {
-       compatible = "qcom,sdm845-sndcard";
-       model = "sdm845-snd-card";
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&pri_mi2s_active &pri_mi2s_ws_active>;
-       pinctrl-1 = <&pri_mi2s_sleep &pri_mi2s_ws_sleep>;
-
-       mm1-dai-link {
-               link-name = "MultiMedia1";
-               cpu {
-                       sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>;
-               };
-       };
-
-       pri-mi2s-dai-link {
-               link-name = "PRI MI2S Playback";
-               cpu {
-                       sound-dai = <&q6afedai PRIMARY_MI2S_RX>;
-               };
-
-               platform {
-                       sound-dai = <&q6routing>;
-               };
-       };
-};

diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
index 4ecd4080bb9629005a026cb8c2a445c4afc07467..e6e27d09783eca2f8a1f7410c421abb72c1c20cd 100644 (file)
--- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
+++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
@@ -16,8 +16,11 @@ description:
 properties:
   compatible:
     enum:
+      - lenovo,yoga-c630-sndcard
       - qcom,apq8016-sbc-sndcard
+      - qcom,db845c-sndcard
       - qcom,msm8916-qdsp6-sndcard
+      - qcom,sdm845-sndcard
       - qcom,sm8250-sndcard
       - qcom,qrb5165-rb5-sndcard