From patchwork Thu Aug 10 06:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp230244vqi; Wed, 9 Aug 2023 23:55:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJY7zkRDDmUUXlm56IGeukgvYdSvFTR1jdD+fZTQfJ6ZC3MWg05rjYwqgdD/C6/SZmZuMx X-Received: by 2002:a17:90b:1a8a:b0:268:13ef:ddc with SMTP id ng10-20020a17090b1a8a00b0026813ef0ddcmr1284881pjb.3.1691650530595; Wed, 09 Aug 2023 23:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691650530; cv=none; d=google.com; s=arc-20160816; b=aT16K9uYxr9h79y347XOQ/wh0mpfpGf3R4B7l01da1akAloFCZ/KA0ueoDTah0bzDk GYQtqCtMk1UHZHmEvtGi+sADvK0fi9tdYMZobCO3VZ/2Jll3CDG6GbeJVSyMhPueMv9V TObx/CapeJG7c/z8mpK4HX/2S255EjlhJpA58bsclNZi2Z5l0OS8gaRvNqQhGhTQ9hYx KcCphZKJmF2lcpdhe3D6csbiUOrWD4BfTE4A2RTtyJDZi7oPekn+X7zyLAngbd1BMHMF 6IKcQeh2hJdYHH0DryapIdyZBcLuEOsvO8bBb+ok24gRvngkyEEXyAfR/Zmp205dUMtu OZGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Ngd6Ty807KCISUZiupnEhx7DHboutfbdjWWPlaLnOlU=; fh=HuVrPYoaf4Z5T9bXc8y1awBO0PCvVK9YIyKtkKzLbng=; b=KsTE4g2mLNYZrp0ng/9pfHvZn92Igp6CrRoyU2Y8FVg2qC6iGK0z+wDnXotBbsIdjx NA8SQ8efApl91OEwisUNdwPjwVVYvERTDQUtrUOxlpqMnDmc3yu0ogqa/3XJcDd9LRUB dALzb9NKVvlOvuZHcxyV2ijsRCnxT+Sxqr12DvDbNMyjeROhkbk39SMNCXrMpJjEPQ1z 6wXks/aXD3kw1GcwxpjVCSoidfQDI6nw8ovt5OGvKR1Wj7R3zA1+Vd5UHinPo4Lj35RN Zh29e1BHfoXV/xC5fjpmTEaRn/4rJ8kuiEZbUhLph707FMs+uEm2Y34YSiG33mv8BX8K JgUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x6s6BlUt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lc7-20020a170902fa8700b001b8c6890612si885699plb.594.2023.08.09.23.55.17; Wed, 09 Aug 2023 23:55:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x6s6BlUt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233604AbjHJGdL (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231358AbjHJGdK (ORCPT ); Thu, 10 Aug 2023 02:33:10 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E136C5 for ; Wed, 9 Aug 2023 23:33:06 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b9bf52cd08so8027201fa.2 for ; Wed, 09 Aug 2023 23:33:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649184; x=1692253984; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ngd6Ty807KCISUZiupnEhx7DHboutfbdjWWPlaLnOlU=; b=x6s6BlUtchliqv3NA5bNBO+uW82+8JEcyL7h04UaYh8Dph1oXrIj9+drohWBK+Zk1/ BrTtyIpBP72mCoYMwIhRWV4zqasu6ISW2D9+MLt1MgglJu6K8DZy0ZijtTMOtbxOAMNK hjtuJ5x8VzPkPdJ/2J1vtWqUK4QRujdPkct7MrnnOHDEHi2q0Cgo2kP6tU1if0c6v0cm y+h+Yj5zBcvKS5f0sqhe5ZMaJvOADWVvWmB/jrDF2DQ+nqRgUm0ZtFbc4JZbK/2+E2IQ epttvAy+jYTedANUHwXrqUOL6ldq+sx+5AuNxKw8uy/RoXdDym3EMexO7TKPI00Me5x0 shZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649184; x=1692253984; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ngd6Ty807KCISUZiupnEhx7DHboutfbdjWWPlaLnOlU=; b=jTaPylAFHnoahd0Qfq6ZGThII8nTy20uRuCh2oI4GWDnxtprQLsazuraDS95WQ2g6S lchptmcHzoknpxkMLsHdfp0EkY6P6fT2ds9q7FGVUY9YMiKCOds1oZt0ndc3jKj/iywS SXjVTCaxi56ES/7z0/b5tp4X/hmQAqDcnbi1AVOfQQU5ITypkJP+bEYcA4vdbseisZ8C KvBx9Xjvx54JU+rMO6WXA0pBmPZK0QOeUq/wBLLzbn/lif4m+/tolDerKQz0eFzi7tXi 1xw+Ts15cHX0CqVZAxYJOmKgOnIxf308GlODVp6m4AEkXUozGQ6vsw6xHJDzxIqMcITL rywQ== X-Gm-Message-State: AOJu0Yygs39B3Ylxl+ujYw7JtGzm0N1d15TCMJpsSUXZHsNj87SIzXss SQ0K4/CRBehFtRkX9VDvJi5rYw== X-Received: by 2002:a2e:9447:0:b0:2b6:fc80:c45f with SMTP id o7-20020a2e9447000000b002b6fc80c45fmr917555ljh.13.1691649184061; Wed, 09 Aug 2023 23:33:04 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:03 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 01/11] ASoC: dt-bindings: Add common sound card properties Date: Thu, 10 Aug 2023 08:32:49 +0200 Message-Id: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773824146638310640 X-GMAIL-MSGID: 1773824146638310640 Almost every board machine / sound cards has "audio-routing" and "model" properties, so move them to common schema to have only one definition of these properties. For amlogic,gx-sound-card, drop the minItems: 2 from the "audio-routing", because any limit here - lower or upper- is rather meaningless. This will also fix `dtbs_check` warnings like: meson-gxm-s912-libretech-pc.dtb: sound: audio-routing: ['AU2 INL', 'ACODEC LOLN', 'AU2 INR', 'ACODEC LORN', '7J4-14 LEFT', 'AU2 OUTL', '7J4-11 RIGHT', 'AU2 OUTR'] is too long Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Rob Herring Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Drop minItems/maxItems from amlogic,gx-sound-card --- .../sound/amlogic,axg-sound-card.yaml | 15 +++-------- .../bindings/sound/amlogic,gx-sound-card.yaml | 17 +++--------- .../devicetree/bindings/sound/fsl,rpmsg.yaml | 17 +++--------- .../bindings/sound/google,sc7180-trogdor.yaml | 17 +++--------- .../sound/google,sc7280-herobrine.yaml | 17 +++--------- .../bindings/sound/imx-audio-card.yaml | 18 +++---------- .../bindings/sound/sound-card-common.yaml | 27 +++++++++++++++++++ 7 files changed, 50 insertions(+), 78 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sound-card-common.yaml diff --git a/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml index bf1234550343..5db718e4d0e7 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml @@ -9,6 +9,9 @@ title: Amlogic AXG sound card maintainers: - Jerome Brunet +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: const: amlogic,axg-sound-card @@ -17,23 +20,12 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array description: list of auxiliary devices - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - description: - 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. - audio-widgets: $ref: /schemas/types.yaml#/definitions/non-unique-string-array description: A list off component DAPM widget. Each entry is a pair of strings, the first being the widget type, the second being the widget name - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - patternProperties: "^dai-link-[0-9]+$": type: object @@ -108,7 +100,6 @@ patternProperties: - sound-dai required: - - model - dai-link-0 unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml index b358fd601ed3..d4277d342e69 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml @@ -9,6 +9,9 @@ title: Amlogic GX sound card maintainers: - Jerome Brunet +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: items: @@ -18,14 +21,6 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle-array description: list of auxiliary devices - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - minItems: 2 - description: |- - 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. - audio-widgets: $ref: /schemas/types.yaml#/definitions/non-unique-string-array minItems: 2 @@ -33,10 +28,6 @@ properties: A list off component DAPM widget. Each entry is a pair of strings, the first being the widget type, the second being the widget name - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - patternProperties: "^dai-link-[0-9]+$": type: object @@ -86,7 +77,7 @@ required: - model - dai-link-0 -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml b/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml index 6df0e03a1d4b..188f38baddec 100644 --- a/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml @@ -17,6 +17,9 @@ description: | such as SAI, MICFIL, .etc through building rpmsg channels between Cortex-A and Cortex-M. +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: @@ -27,10 +30,6 @@ properties: - fsl,imx8ulp-rpmsg-audio - fsl,imx93-rpmsg-audio - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - clocks: items: - description: Peripheral clock for register access @@ -66,13 +65,6 @@ properties: $ref: /schemas/types.yaml#/definitions/phandle description: The phandle to a node of audio codec - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - description: | - 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. - fsl,enable-lpa: $ref: /schemas/types.yaml#/definitions/flag description: enable low power audio path. @@ -101,9 +93,8 @@ properties: required: - compatible - - model -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml index ba5b7728cf33..bac940553965 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml @@ -13,23 +13,15 @@ maintainers: description: This binding describes the SC7180 sound card which uses LPASS for audio. +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: - google,sc7180-trogdor - google,sc7180-coachz - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - description: - 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. - - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - "#address-cells": const: 1 @@ -86,11 +78,10 @@ patternProperties: required: - compatible - - model - "#address-cells" - "#size-cells" -additionalProperties: false +unevaluatedProperties: false examples: diff --git a/Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml b/Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml index 0b1a01a4c14e..ec4b6e547ca6 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml @@ -13,22 +13,14 @@ maintainers: description: This binding describes the SC7280 sound card which uses LPASS for audio. +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: - google,sc7280-herobrine - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - description: - 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. - - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - "#address-cells": const: 1 @@ -97,11 +89,10 @@ patternProperties: required: - compatible - - model - "#address-cells" - "#size-cells" -additionalProperties: false +unevaluatedProperties: false examples: diff --git a/Documentation/devicetree/bindings/sound/imx-audio-card.yaml b/Documentation/devicetree/bindings/sound/imx-audio-card.yaml index b6f5d486600e..f7ad5ea2491e 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-card.yaml +++ b/Documentation/devicetree/bindings/sound/imx-audio-card.yaml @@ -9,23 +9,14 @@ title: NXP i.MX audio sound card. maintainers: - Shengjiu Wang +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: - fsl,imx-audio-card - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array - description: - 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. - patternProperties: ".*-dai-link$": description: @@ -84,9 +75,8 @@ patternProperties: required: - compatible - - model -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/sound/sound-card-common.yaml b/Documentation/devicetree/bindings/sound/sound-card-common.yaml new file mode 100644 index 000000000000..3a941177f684 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/sound-card-common.yaml @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/sound-card-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Board Sound Card Common Properties + +maintainers: + - Mark Brown + +properties: + audio-routing: + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + description: | + 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. + + model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + +required: + - model + +additionalProperties: true From patchwork Thu Aug 10 06:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp229605vqi; Wed, 9 Aug 2023 23:53:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGq6PQy3Za4k34nd9F9ZT9XIitbUPb4pOF/XYjs8270LH1JmgDvbjFH1sgtn+pQfz1rRZGi X-Received: by 2002:a05:6a20:54a3:b0:133:be9d:a9e6 with SMTP id i35-20020a056a2054a300b00133be9da9e6mr2252938pzk.17.1691650410536; Wed, 09 Aug 2023 23:53:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691650410; cv=none; d=google.com; s=arc-20160816; b=vFuNDFxzaO42odqr/ORF4gaTB9lBlis67PLLGoPhyhK/CjkdpmCvKIVmP3/Zw1jxR1 KT8pSzw9ATYV4nwi+rr1WDE8EBYZ2JwIeRNhDsjDBa27meXwfjIM+L9zw1aymj1o/fYf 1WJdgfL3UifNbaexviB+LyVVCnX6HZ86sD3Rdec8g2MzN6CL9yIdpRrgVGJuts+q6+ap H8lfy1UqDhfQiZHK33IKauY8NYA0S6KFHNtNi50ExYMFu4RdJSk+qPeeSyXFxoKQHwAN +/OOEzdQi6PMIQpyBxu3uZmX54cgNJuezZH9EXJk5RMjKJjZyP5rFAiPtGntBI6BNTXd B3kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xRK4u/u6GjShtJ9g8bcUM1XPaEOsUKZUUqbfqiifYIs=; fh=HuVrPYoaf4Z5T9bXc8y1awBO0PCvVK9YIyKtkKzLbng=; b=ZezLaZLsqLG1qi92O88BtV+GgLHDMWJG1Ktvi3xpt6IwHsgprj05igsWh+uhg1s9Wh YA8xUWWm7MiArFe/eXUTqWS6cIcmi6zCzBitRCxAxsOZXcTrh7hLaZcI7KBO8Fz80s2E QU4Gt5dylg+2k0CFNCotMC0BukV2Z9FhJ+qIPjznDcAGlfqIfcPufEJwgvmzHbldWdY6 llm7HFv/+q7CwzBWnqdfka3jkURPOzxesdjrBRvc8TNKYbi6QoTYQKAy/kAOl+zVCwx4 hE/U31d26eyD/juu+39G76505IEy0Ch6H3NAdMIoA4dsyl0bh0tJPIxNsewBTWAEDPxB zUzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EKOLsf+y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r10-20020a63440a000000b005652bd3d231si1038732pga.98.2023.08.09.23.53.17; Wed, 09 Aug 2023 23:53:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EKOLsf+y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233607AbjHJGdN (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233587AbjHJGdK (ORCPT ); Thu, 10 Aug 2023 02:33:10 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA582E5B for ; Wed, 9 Aug 2023 23:33:07 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe4a89e7efso4357365e9.3 for ; Wed, 09 Aug 2023 23:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649186; x=1692253986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xRK4u/u6GjShtJ9g8bcUM1XPaEOsUKZUUqbfqiifYIs=; b=EKOLsf+ykA5qIQjzzOus1wbbzFq81JXaJvdLkG0mm3Ei/C2xTDE/Wu8pEO3Adhv1sB a8fYpYw1hxGihI1MFUifamdPmJH45ZV8HDggIKT3v396ZMr2JyDRdg4/D9PmrKPpCvPL 8EA8uAJyzKgvFa/yGogo535vvEIkekTvq5q7u0arTD8e0FY1RGFxH2bC/gCqRI9mbS9Z aXWnnIogjDkXyOz9T65Ds170m+XMLrSZ4mQOUEJGTsXUZGNMpMsdTEyBALGWponNQ0nj a+D3erhbaW+s3A1Ll/jbyvpMMzlDhOPzMTwzJf18WEgJkTn53cmJNV7nVbKISH4GEA3+ zMvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649186; x=1692253986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xRK4u/u6GjShtJ9g8bcUM1XPaEOsUKZUUqbfqiifYIs=; b=EcFuh/U6mwrhsaFJTmpFMHR5FsPlA+lGfaEcDaDstujgwxIi0WlrZEcLdfONc8Qu3/ x+7lieKtkcnwsZ1SreJKx6m/cch8Ay/uBEiYYKxtmyjvX0YLPKd+w61KAK9gVgLGHYHy ysoEY6bIBzC2zBShaFlugc62c6Z4mEcpBoymtGQkYqzfZErTkf0w6MEyg8QELYScD7uR OZVZDzZz3D8poGbHlQGoSWfx1RGJjUAKJoFTjuQG/fnj1zYZJyst53BN0YRGzzSyjk+e AUF6JdvErdBSjO7mXAXGWbKKGW+WudKBfUpMr8ajAwuvx09H6KxBQnHHOqyz92dUXcy5 GY9A== X-Gm-Message-State: AOJu0Yyi9WucAptx3Od8uvFiOHzfPFYm2ePLEhYhItzb56Tdnsbvayik icK2AxrZDZfCC4uP5iDeQ9MWRw== X-Received: by 2002:a1c:4b0a:0:b0:3fe:212c:f790 with SMTP id y10-20020a1c4b0a000000b003fe212cf790mr962281wma.36.1691649186466; Wed, 09 Aug 2023 23:33:06 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:05 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 02/11] ASoC: dt-bindings: mediatek,mt8188-mt6359: use common sound card Date: Thu, 10 Aug 2023 08:32:50 +0200 Message-Id: <20230810063300.20151-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773824021086633277 X-GMAIL-MSGID: 1773824021086633277 The mediatek,mt8188-mt6359 Linux sound machine driver requires the "model" property, so binding was incomplete. Reference the common sound card properties to fix that which also allows to remove duplicated property definitions. Leave the relevant parts of "audio-routing" description. Reviewed-by: Rob Herring Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/mediatek,mt8188-mt6359.yaml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml b/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml index 05e532b5d50a..43b3b67bdf3b 100644 --- a/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml +++ b/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml @@ -9,23 +9,19 @@ title: MediaTek MT8188 ASoC sound card maintainers: - Trevor Wu +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: enum: - mediatek,mt8188-mt6359-evb - mediatek,mt8188-nau8825 - model: - $ref: /schemas/types.yaml#/definitions/string - description: User specified audio sound card name - audio-routing: - $ref: /schemas/types.yaml#/definitions/non-unique-string-array description: - A list of the connections between audio components. Each entry is a - sink/source pair of strings. Valid names could be the input or output - widgets of audio components, power supplies, MicBias of codec and the - software switch. + Valid names could be the input or output widgets of audio components, + power supplies, MicBias of codec and the software switch. mediatek,platform: $ref: /schemas/types.yaml#/definitions/phandle @@ -86,7 +82,7 @@ patternProperties: required: - link-name -additionalProperties: false +unevaluatedProperties: false required: - compatible @@ -96,6 +92,7 @@ examples: - | sound { compatible = "mediatek,mt8188-mt6359-evb"; + model = "MT6359-EVB"; mediatek,platform = <&afe>; pinctrl-names = "default"; pinctrl-0 = <&aud_pins_default>; From patchwork Thu Aug 10 06:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp228615vqi; Wed, 9 Aug 2023 23:50:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHlgbSh8eK//C3F51nQe3gkcsso9LoeDaji1tWqKlEFnNMVCJV8rcjSO2ZmdIrD2DnPEXXh X-Received: by 2002:a05:6830:10c3:b0:6bc:f3ef:7f7e with SMTP id z3-20020a05683010c300b006bcf3ef7f7emr1568848oto.24.1691650237163; Wed, 09 Aug 2023 23:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691650237; cv=none; d=google.com; s=arc-20160816; b=dfVWHKYwSM+11UL+f1sldlEutn7FGc9wc5Dmmn+vceDT2fIqYLnrRF24YK+0NTHVWL LZb03dlf5Z0hAxn7piT9Qc5qlLcdvLNZ090sWM8M4GQyCa9Ki2Qf2ZTETMh8lOXfnC7S 4BX1AMR4ng7fGigZN5g82+xbIZquVNQbbwiNpGFmjl65WyzwqtBIdPgI7jveysycShsv bkIQqmx7v8aMfmLL2rYR5FJtb76nNJmUuIeQVqP7HqCF9IJQuvk8lNjbepqTugRBbH1k rDpDzAfRyvJm4X/X8CeP7AZ/Y/QOWcgu3kLoafdkMIT0GtiM4+3Tn+M195u1i7oVUegE JL5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=V+hlC8d67YmntwV4mHtT3ZdGF2DLfbF3GgSUytsMD/g=; fh=HuVrPYoaf4Z5T9bXc8y1awBO0PCvVK9YIyKtkKzLbng=; b=ij6r2d2iKQj8Sr0+LaJN74cSfLCZ/KPvBSG/pZzAsMaGmCDq0glR0MPDQNGFukHmuU e5d2x6g/qv8qAZ1Z+wC8yMtL3o9xMTnD8LC3FvPjSRKClug74Pm1pxOrr2pCXSUewjCW 6rHgMbzo4kKpkfKqbb5Td9Bi9Yv3nQz341kv7KxG9FR7cEthcWi8QuYHWl4hFjCUkWiE 2+vzQPTBlxKmAiYlQ5bEctAVZYrT1/8Mhnu+kpGfJFAeH/ZUfCN3pey3oATtCs3uvRSI AcUzIxo139ZLIbLNY8hEXd805QwTFhjB18CxeOFEOronKn0F0yzxWOFVRBJ2D0lS3y86 7nYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xU/RO30v"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b16-20020a639310000000b0055387ef9633si943804pge.804.2023.08.09.23.50.24; Wed, 09 Aug 2023 23:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xU/RO30v"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233627AbjHJGdP (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233602AbjHJGdL (ORCPT ); Thu, 10 Aug 2023 02:33:11 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7486AE69 for ; Wed, 9 Aug 2023 23:33:10 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4fe21e7f3d1so763677e87.3 for ; Wed, 09 Aug 2023 23:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649188; x=1692253988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V+hlC8d67YmntwV4mHtT3ZdGF2DLfbF3GgSUytsMD/g=; b=xU/RO30vWACYxqjtnyOxfTI3eJXujWzw/tOzIRF0AjoT3K3pqKUkKXyMg1cLZOOP3v /yaW305bxyPasG0lRF7V+44ce5JFDRMIfoTnxZeZfjcNWGkAAKBJfCMWWE/BxgFqkryh CHaNdvUeOra1W8UrXNDmgWCY+EkAOo/gHYitQwjbXaGsOJlE6ybXURT/L0xRlFZFceNp ZSBm7qtK88v0UuRLyz+nXh8MVuaPxzEq0FcRHmHV7R7OPfUFaYxJh0dsEzGQsK2PHSZD 3lCkvhEqO/1yjUXL7T9lSyfklQFQW5cIKHgx1X8AI7lcbVQblucLHS3P12I/vKLtHG6Z no9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649188; x=1692253988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V+hlC8d67YmntwV4mHtT3ZdGF2DLfbF3GgSUytsMD/g=; b=faZKw1bEGzTIqps3Sl7oWn7CNp3G5qwBwCPPlNBNzh0nUQwEdOjndpz99I1Bh3tiZ9 ZHywMDhrgQSCknyi6iDABM0ASf/hMK2ckkiSiDBvSrmIIbwJRMrNTwHEqMFikWh6GoIV CHBaUJw3YOCVXE2hiyPfNV562iva2ujUlMrNZypIKHv5jqqblCmF0wl5vv6b/al7V8SJ heNZ3cBXid8hAUxJM9Xi8AimP52u9qHW1TbFnVkGjYs8IsOOx/crOWxwdo0r1Ec5DJDN AkhvYEgyPjuNVuA22s9Auf1gGuPe9xhvuXYBEIZORmx44uCyGXmXMwz4qcHxL61bsVBY MsKw== X-Gm-Message-State: AOJu0YwHtrh/rj/ZXvXpxn+feAvppIVR5+mK1K+jFX/PhkT5ovFJ3W9z jZccaGBHxa9K70pevCsow7SS6w== X-Received: by 2002:a05:6512:3483:b0:4fe:347c:874b with SMTP id v3-20020a056512348300b004fe347c874bmr907453lfr.8.1691649188761; Wed, 09 Aug 2023 23:33:08 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:08 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 03/11] ASoC: dt-bindings: samsung,aries-wm8994: use common sound card Date: Thu, 10 Aug 2023 08:32:51 +0200 Message-Id: <20230810063300.20151-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773823839334404187 X-GMAIL-MSGID: 1773823839334404187 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 Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/samsung,aries-wm8994.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml index 447e013f6e17..5ea0819a261a 100644 --- a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml @@ -9,6 +9,9 @@ title: Samsung Aries audio complex with WM8994 codec maintainers: - Jonathan Bakker +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", From patchwork Thu Aug 10 06:32:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133734 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp250351vqi; Thu, 10 Aug 2023 00:44:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEiOJ5+95WmnbC3Wm8EuNvbxy4TbkUk8dMLckMWB69gCeQab62XavnVUCNnmFIFwY1KaRyN X-Received: by 2002:a05:6a20:3d7:b0:140:94b8:3b76 with SMTP id 23-20020a056a2003d700b0014094b83b76mr1858793pzu.20.1691653451600; Thu, 10 Aug 2023 00:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691653451; cv=none; d=google.com; s=arc-20160816; b=ZEOSD4W0i4Ijm6CLimB+UzmXVJUyIrsjjQcYpjZdYR2GS0ZmElkqy0cNgZM2ndKQn6 sBulPVEFPNoBeHk5+K/elhQ0I9/xdmSRqxJp4Q3cpAjVQqJlj9j57nlkUa0HmTnslBSx vQoYRKcPURtMeqWy9CqIgXLk+BeqKlggCClnxm9usw70ixCpl5H5Kk2ozsDFaBdxoeEL MEOZDhiWsHP9Ctz6H5fnvGtyJZEhHtY1WE0BdRrNanFEk9tWciD0BCEDezC0gihXy8Rr RUt2n7f6Q0/DtTTsSDBSJKQ5eOpjq1WalFh45pAzjbHjyTXBDDbQM+8d2xXqOZhG7QzW 2gfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jYTzTb8UrxRc66FImFP9rRfhwslszsfgsuSxr/7YLlU=; fh=HuVrPYoaf4Z5T9bXc8y1awBO0PCvVK9YIyKtkKzLbng=; b=Z7dOvegdFOXsR1JJ53r8P/PdtKzTDepz8fJiRh5y98tDvCZFQjqJIkpQcHf7IaE/mC WVs5sRpYsPe6ERgED7L/zavaZQ+R24piWmArE08Lcv6dO21QoYaisWeledSDlTWseYM8 Jgr1w7jwxHvlJuUnRxtCxbYScIBssrt0x7mD0KGKbjyNV311mQZliQwUydfz9VBbyEbb CokF5zkjBTHPmDV4cU46K4ZE+7vJQhHCHdwkpzDejTnXaRn0I2jJsNncuiLLRsmZ2PIs w0q1y6J/Qw8r+NsEdMw8UoqkuUuOpmG42B2BT17kIU4BG+6n/i0dEdZNVFwFAmN8JgG2 tCXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XVBoF8/y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk4-20020a170903070400b001b8a591d5b9si984461plb.133.2023.08.10.00.43.57; Thu, 10 Aug 2023 00:44:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="XVBoF8/y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233670AbjHJGdW (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233609AbjHJGdN (ORCPT ); Thu, 10 Aug 2023 02:33:13 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 815F4C5 for ; Wed, 9 Aug 2023 23:33:12 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3fe4ad22eb0so4682745e9.3 for ; Wed, 09 Aug 2023 23:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649191; x=1692253991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jYTzTb8UrxRc66FImFP9rRfhwslszsfgsuSxr/7YLlU=; b=XVBoF8/yUIY8PYBHbJ0Z7j3ZbEFoK9XkPKGih+mU3xS6CHBVaV+E0rs9k7VHhJNUqY woMLWZioH8QrrAqWcuFhR9m5Vu0Iq8ia7WIu7aVeqrcjYHU2WD48Hz4jAjqaHVTBvejV gpaUjTWl2Fnuyq4TyzmmTDFvks/qHg6YwnFTwFmuQLKbLhwrkf5EUQ9F5chIaUg5yj4G LdyaY3nW5radp2afOmQ388Arp2Km9PsKOFERYVJcnhs6gccUF7rMee8rqyenPJ4yiOnU 3MWV60QVUcPvc4ieNtbGjzC8Ga6jPurlMbqxkTSkixHbUqV75zBWK+bc7IN4+fcp4Q72 S1GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649191; x=1692253991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jYTzTb8UrxRc66FImFP9rRfhwslszsfgsuSxr/7YLlU=; b=Az6yXXSdRN9lwxhYqHDMxzcB2b3lEUofmyNYEdcC4x1SZdF1pbmABitjhE76WHO9wB fR8MgstM/JPfUvSuiBUR/j0Yi6zWlE1CeaiQ60UssZ09JRcJhnummtvqWlH1SVuYUl1t URbpFdXGOQm9U324Kv3vBcDqn2+qajKyifJvtWVn+PGiMeuoMAHbPWB0z9GWfoj51BV2 pLm4vSyMlkAx9KJw91/yadW6IwVIQPH956FMqbydseLb6YNOk7DLjhh2fFWMZbx9FEHU VD1fqAVlTNzgpmZ02WnG1jifyQ/Jh3INT4M1lkfL3+kZUfd1sgclNhzkJ3GHa5R6G+p0 lsqg== X-Gm-Message-State: AOJu0Yzs85rtkqYZqgNHTsqSeSax3IUw1fXWjjEOnRpBQcxnTfMdwyen KJDNKCTsN8qiu4eFjSnKStBMTQ== X-Received: by 2002:a05:600c:213:b0:3fa:934c:8356 with SMTP id 19-20020a05600c021300b003fa934c8356mr1122754wmi.10.1691649191009; Wed, 09 Aug 2023 23:33:11 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:10 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 04/11] ASoC: dt-bindings: samsung,midas-audio: use common sound card Date: Thu, 10 Aug 2023 08:32:52 +0200 Message-Id: <20230810063300.20151-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773827209594629634 X-GMAIL-MSGID: 1773827209594629634 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 Signed-off-by: Krzysztof Kozlowski --- .../bindings/sound/samsung,midas-audio.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 31095913e330..6ec80f529d84 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -9,14 +9,13 @@ title: Samsung Midas audio complex with WM1811 codec maintainers: - Sylwester Nawrocki +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: const: samsung,midas-audio - model: - $ref: /schemas/types.yaml#/definitions/string - description: The user-visible name of this sound complex. - cpu: type: object additionalProperties: false @@ -38,6 +37,7 @@ properties: - sound-dai samsung,audio-routing: + deprecated: true $ref: /schemas/types.yaml#/definitions/non-unique-string-array description: | List of the connections between audio components; each entry is @@ -45,6 +45,7 @@ properties: being the connection's source; valid names for sources and sinks are the WM1811's pins (as documented in its binding), and the jacks on the board: HP, SPK, Main Mic, Sub Mic, Headset Mic. + Deprecated, use audio-routing. mic-bias-supply: description: Supply for the micbias on the Main microphone @@ -62,14 +63,13 @@ properties: required: - compatible - - model - cpu - codec - - samsung,audio-routing + - audio-routing - mic-bias-supply - submic-bias-supply -additionalProperties: false +unevaluatedProperties: false examples: - | @@ -84,7 +84,7 @@ examples: mic-bias-supply = <&mic_bias_reg>; submic-bias-supply = <&submic_bias_reg>; - samsung,audio-routing = + audio-routing = "HP", "HPOUT1L", "HP", "HPOUT1R", From patchwork Thu Aug 10 06:32:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp230800vqi; Wed, 9 Aug 2023 23:57:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEeF7CLGd3Up5dmIYE5y8jnhphTyPUcQBEIndmN0CR4hTwhRrjzTlcOjE/WEo8XIxlWVoFF X-Received: by 2002:a17:90b:4b10:b0:268:3dc6:f0c1 with SMTP id lx16-20020a17090b4b1000b002683dc6f0c1mr1351688pjb.32.1691650630886; Wed, 09 Aug 2023 23:57:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691650630; cv=none; d=google.com; s=arc-20160816; b=zNau+vvzrxBG2lLaiz2L5/tywsm7qt1ahT6dk32ROrKsTjkIRmvnro+7KIY3TyMkrB bJtWyeglqd7CDrt5BUwv+29bjy3Xjn79AD9+hKpQt4uHMGti1ZEoj4PulRSBtJWRV8/U qhdv87jvoUj2dywz38mVlPTO8PiK3nPVedicncUR3RLm08SMsuZ3coQjdwjmqtqpEImL D2KYQjZ3nEQlKIP5VJmR/ZN57V9S5/5gseOYgsWbNI525XNIMnxoiBUqyTLWkEnZNR9C 3FttJ13sin2W3jjVYbN2EHdkjcz5m7+8Z6IPeP8xmHsi8cHJVVh/ce5fd0OlklE/dAW+ VIgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eSd9+dSCMBHcEUNxg9MGXggi9cWLvGAB+LtJE315jeE=; fh=HuVrPYoaf4Z5T9bXc8y1awBO0PCvVK9YIyKtkKzLbng=; b=g9zT4rOrmSe5E7oWdw/LsFz7gZHU+5ZPtCl2LMsiIB5NS5S3Y9q6w0ZxKBTGBGWS65 NrNuLSv+tAFNPGN7akeLmPpWh7Bg/kbLC/wQVNMTr6CRQd+hBXGBq/md/oKcGci7cWkD 539B0NGUeDESvUU0Pjn+Fbyv2TUFO2ccMbhOEUxu/gwteaXoUqyjX3S02PNdiPGJErcF YA/oPbV739FBd9wzToHuJvICWoXtWLURtm/Sf+Z/YDuk3G8mZyj8iWvHqlR3LNfDruZj 8nXdtlxTOrWSY9W0nzaGiHkJAM2soSbsjIL1HcxOy0OGMrEahyT3KjqIi3ddBA5HG4jv BEKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mRr+gxVp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mi3-20020a17090b4b4300b00263e1d9c4f2si1057382pjb.26.2023.08.09.23.56.57; Wed, 09 Aug 2023 23:57:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mRr+gxVp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233672AbjHJGdZ (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233647AbjHJGdU (ORCPT ); Thu, 10 Aug 2023 02:33:20 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBD7C1718 for ; Wed, 9 Aug 2023 23:33:14 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3fbea147034so4585045e9.0 for ; Wed, 09 Aug 2023 23:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649193; x=1692253993; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eSd9+dSCMBHcEUNxg9MGXggi9cWLvGAB+LtJE315jeE=; b=mRr+gxVpp7pg8jiFsl0EUQi5k0c8YNKWhwr6kNOBuPuxwnKM5eZyhgXsxqDAbhRuoA PTWTEzAVio/vIkXOYyPEdBPSDhIgUOcWOeoZWEizWD16j9Ab7f6v3priEedUhIdxLxY0 dukP7frX7T5QWOyLE6qZRj74zajXX9XcaRvpNY2gGNCJv69kWiQG8FAglIq1J0ovIaCW 3WrUgKDYi7t9i+rceE/UMbW9R9MzrzADAIVpM73fHvDZiSVDHTx6Nt9xr1yG8A25FIgh 1zj+Quf8e/cz4H6+Fv0UtOrSTXcqmfQlOrCUIwG/BQl4xzGvqT4K7AoasOrss9AoIHPo DwQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649193; x=1692253993; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eSd9+dSCMBHcEUNxg9MGXggi9cWLvGAB+LtJE315jeE=; b=XWSQ+n2fBx132KLLrWKSxLGfpL0JPFsbEPxvezwTeK7kMFqRtIP+ExtJCu5BAilcIW 4IO8wOV//npaW0o/D4SutAVGuR9UWTzauUQ4AZQgiADSmLMw53sjav7QPenVYq7dr7PU XhupGeWFPkvCqG4dD6M68ZLmwxN8rDj7dFbnb/7bSn+FXsIduBRG2OiqyNspTWvfFzs6 DR6PyQgU6xaD2QnkaMCbgHEoKv/QNAOIxV32yskTIu0JPiySK6x/8l6ICXzu2VHIc7U6 UmVpOWbcbytnRd4kAn59fkqnhY4olpY5GCH2ocpk+iBzEVLTUXG2NFMkiTzMNH+aJl9N qUYQ== X-Gm-Message-State: AOJu0YyH01A+Uh/hmtyo1snAO4Usf2igCmyeHjXgMOj3q5VinKnblkHb CxBKP40gljtU1KCktLOu9s9jAg== X-Received: by 2002:a05:600c:3654:b0:3fb:403d:90c0 with SMTP id y20-20020a05600c365400b003fb403d90c0mr1018356wmq.39.1691649193448; Wed, 09 Aug 2023 23:33:13 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:12 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 05/11] ASoC: dt-bindings: samsung,odroid: use common sound card Date: Thu, 10 Aug 2023 08:32:53 +0200 Message-Id: <20230810063300.20151-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773824251954493163 X-GMAIL-MSGID: 1773824251954493163 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 Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/samsung,odroid.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml index c6751c40e63f..b77284e3e26a 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml @@ -10,6 +10,9 @@ maintainers: - Krzysztof Kozlowski - Sylwester Nawrocki +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: oneOf: @@ -24,10 +27,6 @@ properties: - const: samsung,odroid-xu4-audio deprecated: true - model: - $ref: /schemas/types.yaml#/definitions/string - description: The user-visible name of this sound complex. - assigned-clock-parents: true assigned-clock-rates: true assigned-clocks: true @@ -52,6 +51,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 @@ -61,6 +61,7 @@ properties: For Odroid X2: "Headphone Jack", "Mic Jack", "DMIC" For Odroid U3, XU3: "Headphone Jack", "Speakers" For Odroid XU4: no entries + Deprecated, use audio-routing. samsung,audio-widgets: $ref: /schemas/types.yaml#/definitions/non-unique-string-array @@ -70,18 +71,17 @@ properties: required: - compatible - - model - cpu - codec -additionalProperties: false +unevaluatedProperties: false examples: - | sound { compatible = "hardkernel,odroid-xu3-audio"; model = "Odroid-XU3"; - samsung,audio-routing = + audio-routing = "Headphone Jack", "HPL", "Headphone Jack", "HPR", "IN1", "Mic Jack", From patchwork Thu Aug 10 06:32:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133717 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp232415vqi; Thu, 10 Aug 2023 00:01:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpWnO9mGvttmDAbAGj6pnt9vxFvmxmF6i4CawOvQCtyQWaEWyouhYEffX9zPvifi6+4k2N X-Received: by 2002:a17:902:6b46:b0:1b2:5d5b:e871 with SMTP id g6-20020a1709026b4600b001b25d5be871mr1345761plt.59.1691650867537; Thu, 10 Aug 2023 00:01:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691650867; cv=none; d=google.com; s=arc-20160816; b=Ex9cPtUJmpq+R9D+7y9myDclDKH0NFW/KuPX2Ch1TIpcrS77MFEv5f8YXrl08hN2jw /a1b1EISIPtNhwnw36vrPfJHcRyYNtdEadgvgMRF5Rzwj3qnHXC8eGBJxRD4H13pTjS5 WvoAtOTT2rN/okrysKZEMJl0bqs4GDqm+sI7lIAxL8O4XbPDMSb8I1psMDO9biYEgVcg gd2azJ2vt+DV3B04rVZHZr8WUKnYEkwOTtuWhB8aFvzIGsRG3BBO5eJ3CsTmC8A6SQ2l E0fwdTaznQH6Dkj5psWXPttArdjsbE97APEeGNaQdVHvlsiw6KDuT4E8itVn/LvVS/3T VuWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=swPZatRmU5IAV5ZeCQ4kXkKbN4f+jKft+68xvypLEqM=; fh=HuVrPYoaf4Z5T9bXc8y1awBO0PCvVK9YIyKtkKzLbng=; b=XGraGMrjyj+SwaVZX/s1o8RVqCVZDYgTH4mblkHIHARBVWmemLNn3vynX16LzDuIUu 5IIvD+7MjkX3WBqkZgQqXsEMfwbb6VYr+0n1S1x8ce0SK7VaqQFfhSxzP6azf8O7aoL8 49mlgkFfio4LLynKSqPnOX0ZJclQPvkd9DHfYGTHSNDCBCvUVJB0N65GjrTZkOkTjL8k 5OWsH6o7VqPUJxYuF5FXDPt1L00BhDa3aEBXgZloLK6ObXR2GqKeKx2yXmwBeZ9X2iv0 uDJFUMTYwy0RICbsgTJySq0sEm7Z2Q7QCzmUAVTiOVFjMs5Ke+9/1sXn4YNLryjNbGN1 3JZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="LsM/h3KP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a17090311d000b001bc7d717ac4si936707plh.104.2023.08.10.00.00.52; Thu, 10 Aug 2023 00:01:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="LsM/h3KP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233714AbjHJGd3 (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233637AbjHJGdV (ORCPT ); Thu, 10 Aug 2023 02:33:21 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5A652106 for ; Wed, 9 Aug 2023 23:33:17 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4fe1489ced6so791406e87.0 for ; Wed, 09 Aug 2023 23:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649196; x=1692253996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=swPZatRmU5IAV5ZeCQ4kXkKbN4f+jKft+68xvypLEqM=; b=LsM/h3KPobzkTcoOxI5RPb0T84ud0ZGa4N6jmsjPveiCQzV7GU6U3za5q2AyO4B+5n wo+am54GWZdmEQr7eZszZcWrHM3Xd2eu3AQfdqqekomh4lTA7GwaFrZBJw9iaTmYenmS N9vy8Kgq357VzueL7xAclqjL1GRsGamNq57RexwJV8w8/d6hWz9J9vcqxzQ9nkGbuR4M MNxVek3Fl72nyvkPUlRrBizy1HpDb9unAgTEwUnaWQ4MYuoI9oA1svnj3wqg/G7/3iJA IBhXL09whKGx2e5We4vwU1V1BFTHYcs0bXXhIPRz/tROEOoMjMtQtvpZ27Wa/0hxEud1 8kSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649196; x=1692253996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=swPZatRmU5IAV5ZeCQ4kXkKbN4f+jKft+68xvypLEqM=; b=Sm23cJpKnFw8Iej8HvHfHMvfZYaix2xAfD+3iDFzpeFHIhb8G+ZDkD4NEgqmpwuya2 Ea1vccI33XojgEXyEhgqhnUgx9tNETA8iDnC0jUsbAQ1JSo/BVCsNCMGNfDEqhm3aUi0 jTYa38jUa/vjIK8ET1uTh0wgJKNFmDnrBYcHebZa9WiDY7aWeZT2gPzyVG9gW5sIGizh Vi6pjjFS3axTGcvHbTPhBEyn9vYrMlef8pzij9EZMxHWLxVn1oyzXae3ovrrVzdRGouf 04+e9KPII4Bq1qloYojbo8jVZ+PjAyfI0QVfdalY2OfJJ7xGJ5TF5uF0l2qbQuJs9840 TyRQ== X-Gm-Message-State: AOJu0YzNjJrhkLB/ABRTba/94rW9QOIT/dgl4e4DkJuc1hLUGmMyOQu/ PQ09LREpOWOVNdOu8wKU183q+g== X-Received: by 2002:a05:6512:3e1f:b0:4fe:5795:35ed with SMTP id i31-20020a0565123e1f00b004fe579535edmr1082315lfv.6.1691649195909; Wed, 09 Aug 2023 23:33:15 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:15 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 06/11] ASoC: dt-bindings: samsung,tm2: use common sound card Date: Thu, 10 Aug 2023 08:32:54 +0200 Message-Id: <20230810063300.20151-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773824500171383612 X-GMAIL-MSGID: 1773824500171383612 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 Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/sound/samsung,tm2.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,tm2.yaml b/Documentation/devicetree/bindings/sound/samsung,tm2.yaml index 491e08019c04..760592599143 100644 --- a/Documentation/devicetree/bindings/sound/samsung,tm2.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,tm2.yaml @@ -10,6 +10,9 @@ maintainers: - Krzysztof Kozlowski - Sylwester Nawrocki +allOf: + - $ref: sound-card-common.yaml# + properties: compatible: const: samsung,tm2-audio @@ -32,6 +35,8 @@ properties: being the connection's source; valid names for sources and sinks are the WM5110's and MAX98504's pins and the jacks on the board: HP, SPK, Main Mic, Sub Mic, Third Mic, Headset Mic. + Deprecated, use audio-routing. + deprecated: true $ref: /schemas/types.yaml#/definitions/non-unique-string-array i2s-controller: @@ -44,20 +49,15 @@ properties: mic-bias-gpios: description: GPIO pin that enables the Main Mic bias regulator. - model: - description: The user-visible name of this sound complex. - $ref: /schemas/types.yaml#/definitions/string - required: - compatible - audio-amplifier - audio-codec - - samsung,audio-routing + - audio-routing - i2s-controller - mic-bias-gpios - - model -additionalProperties: false +unevaluatedProperties: false examples: - | @@ -70,7 +70,7 @@ examples: audio-amplifier = <&max98504>; mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>; model = "wm5110"; - samsung,audio-routing = "HP", "HPOUT1L", + audio-routing = "HP", "HPOUT1L", "HP", "HPOUT1R", "SPK", "SPKOUT", "SPKOUT", "HPOUT2L", From patchwork Thu Aug 10 06:32:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133731 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp249535vqi; Thu, 10 Aug 2023 00:41:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEt5c7FknTks79+r2hyIIdV7poz9W5IiEytSosHcgxM8uNB/2kT22vAZtQUE6C2jWuO9ZQZ X-Received: by 2002:a05:6358:292a:b0:139:d5b9:87d3 with SMTP id y42-20020a056358292a00b00139d5b987d3mr2465124rwb.5.1691653315055; Thu, 10 Aug 2023 00:41:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691653315; cv=none; d=google.com; s=arc-20160816; b=bKLgS+/z7D1hr0isMw9Y3D98TIb6tbyPaHj7MdTwZj8dKBI55bJ3+2OEGPjOfuLeEN UJsoXJ2ho+SwdkJuRN9/ox9ymolrLUM7b7xnZCukpbhKVfYkcuI4hUVxRvaXvQT7IN1N 43IIs4HHGHQAFt+659ufP7fli+Sz+QqP2MEoxcJBoA8zZD7FOxXyAwvHMnQhvxUL9qj7 Je/I9QnwZM2aaGZ18qQl05DEHJ+Om05tO8iWqtYWWemWlTOJAjXFOtmUgMfIlJIl2Jaf KckCBbs1tnqiFNX5WEG1Jg0NSzn+ad0lNUnfC7+HIOIf6rlaNfgnYBDnSBSGB6p6Rxwf X8Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HYK3gBdbZNa0sNOQK67Ss/5e2crqIr7FWYCpvQqQW+g=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=w5C9JIqKh++SutaxDvhodf0NdcCocHK23bYmLfjoG+h23vtSk8L8E1e67dpCWGb1pu oPyCwQ5k8BJfFyVOoqZub2vzN1Tbfjus9bD+BQ5x0TeMX3CE1zdhg8OvuENJJSd5gCy6 dGJ8Dzrqp5YNwk9I9KNZzEWetqFGchy7WB1fGABsFjKH2secXrzal5OD8fXQEkdEH2bK d/i1xjVNqcNonKOldWzK08+O6x+A2SwgWBWYgkqCrIhvJz6upfrI2Z9li+s5oULZrQED ExWcW3/FMVdNKNtAYDtzMurgo1c6pO2fZ0gH23E3v0rUhVqjOVMDXTGoagYsSDOE5gvF /Vuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zMl0Q6Wo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r9-20020a63fc49000000b005653e3f6d58si1087845pgk.748.2023.08.10.00.41.41; Thu, 10 Aug 2023 00:41:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zMl0Q6Wo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233715AbjHJGdb (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233673AbjHJGdW (ORCPT ); Thu, 10 Aug 2023 02:33:22 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB275269A for ; Wed, 9 Aug 2023 23:33:19 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b9c907bc68so8550871fa.2 for ; Wed, 09 Aug 2023 23:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649198; x=1692253998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HYK3gBdbZNa0sNOQK67Ss/5e2crqIr7FWYCpvQqQW+g=; b=zMl0Q6Wo4VQxBOxQpo1rTcZRIWwM309TN6yCpDr/EeJrTnVpUvCkfew3iUmCwJpBBI MChHsatOC+ZhTfU2GaboaU02NCWtGr0R7Gbm/BTk/oo1E7nczfHfoN85tuwbxL0uJTEo ZaGHg4nLZ4pbZ5BbBxSkikvWi9RcizQXngjyy4DdN1wBLiBT3TIoW3brijqlQs6hlXHE 7tuvYU4gYApdVRXh2fRnXMsZxuZb7lmL0XjHsLL+pxGon2FmmwvaKEobyZ3mXvtUv8Wv jsl+QYF967v94rD1iOqlmd8WDBTfo7YsOmIQLBuxdeAsQz1qI0dhUFzOtv67ghiWnKzw 2SaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649198; x=1692253998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HYK3gBdbZNa0sNOQK67Ss/5e2crqIr7FWYCpvQqQW+g=; b=j2eWjoUd0vKtAcEn0lUpWp6g+4hK81zo1Pk4V15aDXYPUgeKGFokCvlOguI7Rqr9Gk d5iaqf+T+SNFYCjcM7xKSzdQXRJl/D1RiI5s28eT0Evy1sdgz1VSilas562rv91cRFKV Ain60G9k5vvYaNz9FgIZahmsu/pgg4xTa8z2ztctmY+8QTmJ8jpXgiinz2VFXlkPQtKI ERWOkvVpgMg/2+IGuKbXD6ZNdNMcsaEd8NrmYbxEUJQePSn4t9POUUyj79IxebFQEI68 LmhUBNBLPFfl9nRxKIYPFMqr42cR7YaryLX6HYhRot1xbKjVOBYi+BxXieeW7L+uycmG 0bdw== X-Gm-Message-State: AOJu0Yy2+8S9xtlLbQ0umJuAWeAtiAttOKAZVfq8winrDmgkQuOVN++T NNK57zHjT94DVK7ncVSliJJBsg== X-Received: by 2002:a2e:9a84:0:b0:2b6:df71:cff1 with SMTP id p4-20020a2e9a84000000b002b6df71cff1mr1059849lji.52.1691649198267; Wed, 09 Aug 2023 23:33:18 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:17 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 07/11] ASoC: samsung: odroid: use of_property_present to check for property Date: Thu, 10 Aug 2023 08:32:55 +0200 Message-Id: <20230810063300.20151-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773827066141129299 X-GMAIL-MSGID: 1773827066141129299 "samsung,audio-widgets" and "samsung,audio-routing" are not boolean properties, thus more appropriate is to use of_property_present() to check if they are present. Signed-off-by: Krzysztof Kozlowski --- sound/soc/samsung/odroid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index a5442592bde4..1743bd55ba1a 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -223,14 +223,14 @@ static int odroid_audio_probe(struct platform_device *pdev) if (ret < 0) return ret; - if (of_property_read_bool(dev->of_node, "samsung,audio-widgets")) { + if (of_property_present(dev->of_node, "samsung,audio-widgets")) { ret = snd_soc_of_parse_audio_simple_widgets(card, "samsung,audio-widgets"); if (ret < 0) return ret; } - if (of_property_read_bool(dev->of_node, "samsung,audio-routing")) { + if (of_property_present(dev->of_node, "samsung,audio-routing")) { ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); if (ret < 0) From patchwork Thu Aug 10 06:32:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp271027vqi; Thu, 10 Aug 2023 01:33:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXg2OxFEHTTRQvKafV0sMJ14CH2A9n/uSiJGHqsMyJ9YSAY+T6XLXQxCo+YAMWKhjnFUou X-Received: by 2002:a17:906:3085:b0:99b:f534:9bb6 with SMTP id 5-20020a170906308500b0099bf5349bb6mr1719780ejv.9.1691656420769; Thu, 10 Aug 2023 01:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691656420; cv=none; d=google.com; s=arc-20160816; b=HrgxsNeNSD7q1bDWz7y7fT/b542I9ACo5eXxcHRiUlEZwgP3VZ3G+ePRsLz67+GvX1 Xw3wZsaeW48Aev+/ZVWiYuRfCCGHWNTeUszG03WwOrHXjr+eeFtr5wW8h+y2sV+OKEEI CuPH07QxJYJ/2gxufHMobVh530haq5+XTDLQZk+ivik8MRFKoZDoCoYhzzG6Ia/iTzkl AJDO9w8ebdAQVwGQ8tKOGoIDBRXINLFEd6/SwTBOrXq3a75k5lTYToB3UlL1soxGUTj7 WN/BTgNqZbg9g0w6HQExEcIl1r/MQKTEPzCuoNxzMVy2zxZG3vW1mshxYxv53HUjvB41 kVwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2vbXpmjMjw+lKtOoDoBL66la8kJXNdX97D3faoVkRss=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=ZGXW2tnXcJ9A3FzRsU9z9vdYoBsJBzQ3kwHf3LGPCrxOyHRQC/n+NK2gFKmmEX/FmN LBSX8hxnTppNwJoPB49yiZSrOZd0tuaEsbQtVjWX4T+bAuy3stWfVZo7THh+6aosAApr VUAqKKUESitRH1S5b8wEYodC6T+Ti94Pxb2Xvz7p9W1QhEXWuqvWLZMlIXjoR8r6/aep FHvpwNz7bQAioIJt5v46Nifb+ZBvsIRr9kulL6VFEJxN5reP2tleI3YPtZCR084vQ8b8 b972T7lGbRkGTwoi/4qMWI9/+3cwnyi5l5rMCdD/2SGcO9PXsP7JVvdefd+zhwOKXVJK sYoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qRwFGkjs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v9-20020a170906338900b0099cc15f09a1si1088641eja.118.2023.08.10.01.33.17; Thu, 10 Aug 2023 01:33:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qRwFGkjs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233256AbjHJGdk (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233705AbjHJGdX (ORCPT ); Thu, 10 Aug 2023 02:33:23 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0DB326B1 for ; Wed, 9 Aug 2023 23:33:21 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fe501e0b4cso4783285e9.1 for ; Wed, 09 Aug 2023 23:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649200; x=1692254000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2vbXpmjMjw+lKtOoDoBL66la8kJXNdX97D3faoVkRss=; b=qRwFGkjs7FH05bLZCJETWbxdoViNxeC39FXgvqqlKU61gi57Ql7yy45M1F9AB8/Vnf m4mxqNHy7YspE8rZapqbpkWRGZNRknmR0Yw7mWVyCBYFhav+VPIm769MnpWWKLDWK6vD vC9kR5dcS6XYThPTkqfm7G3IaFxYAITemSv9pNs25yTxEymWJ1iCR4S+CpNCl/bM8AyP mrkj897BIXv6i7FCzrK0Wv2NRScb1bjBumNlC2vJIZeqIGZU5Uqzi7GP1fP1aQdTNOBW HBwf/zF4nwCb5TmpvViNmeug8wNpHdz1zKVQBEZuO6N2j7ktVNinkhjQ1eADaGOvVh0w T7gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649200; x=1692254000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2vbXpmjMjw+lKtOoDoBL66la8kJXNdX97D3faoVkRss=; b=gRWYRA8I0L1EA4Fu4Yc5EThL9aXNOgHDmjO+CSUqkh5FycBT9aaNwEXmuM3uwNF0Dq 6N5t+TOgX38AjDjdDPdFPa6KWSxbe9ALwtJ+8mAEv1U5Kw+clfY2KHJ1O5uIeRrH0Vx1 N0v59GmYuPMXtfU5/KRc+672tqhEY2mND9VCURpVoJRyaEbhCfObW5YAaobmZxRreUsO Wu0IRr5K3Fm2HDxoc0fp6Vgy7S9sKcLPlKbVqhglRIYFFkh7ybXq7mOhFwSwKdLmkMjZ ALV3xBOUguA1XYOh0n36aJP5jlvKF4Uj+jucLhydCaSidngqRR5deJuqLA6yjggWhGfs CG2Q== X-Gm-Message-State: AOJu0YwS76eIAwq8TR/z7Tt1MveP+DNtGpXQC9ZvRoRhh3+3ls0RTOWk DvcB2pq8dosMjyosf1rkyTPUhw== X-Received: by 2002:a7b:c398:0:b0:3fe:1820:2434 with SMTP id s24-20020a7bc398000000b003fe18202434mr1112564wmj.1.1691649200441; Wed, 09 Aug 2023 23:33:20 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:20 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 08/11] ASoC: samsung: aries_wm8994: parse audio-routing Date: Thu, 10 Aug 2023 08:32:56 +0200 Message-Id: <20230810063300.20151-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773830322995465291 X-GMAIL-MSGID: 1773830322995465291 Parse generic sound card "audio-routing" property and fallback to "samsung,audio-routing" if it is missing. Signed-off-by: Krzysztof Kozlowski --- sound/soc/samsung/aries_wm8994.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index 7492bb41456c..dd3cd2c9644a 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -620,10 +620,14 @@ static int aries_audio_probe(struct platform_device *pdev) /* Update card-name if provided through DT, else use default name */ snd_soc_of_parse_card_name(card, "model"); - ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); if (ret < 0) { - dev_err(dev, "Audio routing invalid/unspecified\n"); - return ret; + /* Backwards compatible way */ + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + if (ret < 0) { + dev_err(dev, "Audio routing invalid/unspecified\n"); + return ret; + } } aries_dai[1].dai_fmt = priv->variant->modem_dai_fmt; From patchwork Thu Aug 10 06:32:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133724 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp247322vqi; Thu, 10 Aug 2023 00:36:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8h+SaoL0pxMtsOlb6AN4ZqqONbIlkKVFiSQHwqmWv4JXd1dFdmvnwAoRbxvFI8eRBCP7O X-Received: by 2002:a05:6358:91a4:b0:133:a55:7e26 with SMTP id j36-20020a05635891a400b001330a557e26mr1884180rwa.7.1691652963479; Thu, 10 Aug 2023 00:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691652963; cv=none; d=google.com; s=arc-20160816; b=wB6581XO2zF2GzyCl1O5Cmnq0Ik7Rgcs266CGMaaaOWoIM8qxezMta7w+P9s9yS0Hs M7VtQWQ6BR7f7rHfStoEtFViJgEMSIO0KXDPrEIimwxMrzrY5BrmSWb86F01NNgjYaUP YMkcfyPMKq1A9RSWnRi97nWjqaB9slhAG7OSmdicw3AFY8aDcLMBZ+xlpTc+F2t6fqsh QLzAJb6sjdzWMDqJ8N6v7l8K6UlBhbfMLAMqatqMtltWxEHrSFE22Smvnx5vWNA7Xj8p UvKl8mIyc+QJ8rQPJ5D8qBpwGEFxc67ymsBUyJNgsGT59n/EW8nyvePYRmLJMOrshujP 81Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WNOB2kSBm/ZCjLUQLsGBk0BsOPSn2yUKgs+5rBFTqgc=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=Yto8CzBJDwHCadhT5wFkzXYFsvzzEjWAlklU/XxRPiyJyZThy3Q40r1uT7JPuHEVSi FL3QzvbFjtY1pCWQSfLCw8mWgmWW+jsd+34CDb8OU3bRPoxLdE9adYeWdc96dgBFhvTV 0o3+BuLjKngVUbkzTjZ9xbZc4GPgvdw3KIkTwaqlRGrpMgSiJIIsObcDdbEpn1BEahfV GlzTU97EHi+Z0elt1EigtwTdMd/bBrx1TJYTJrFx9w8HTtQhlIQzUPACh+8d0vxQ6Gn0 J00iPpqtEK94H3MoDVz/LOYPqZgmf6samBAzOPmPkZcBHICLcOrEbq/aSmHWpKQQM+Kj KHDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nLzSxmdC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c6-20020a6566c6000000b00563fbbe378dsi1060542pgw.347.2023.08.10.00.35.48; Thu, 10 Aug 2023 00:36:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nLzSxmdC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233699AbjHJGds (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233698AbjHJGdi (ORCPT ); Thu, 10 Aug 2023 02:33:38 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F7FA268C for ; Wed, 9 Aug 2023 23:33:24 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fe5eb84d43so4922855e9.3 for ; Wed, 09 Aug 2023 23:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649203; x=1692254003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WNOB2kSBm/ZCjLUQLsGBk0BsOPSn2yUKgs+5rBFTqgc=; b=nLzSxmdCld1p6/GNXMg8hXGakyqAdX2VctistK9WujPaXg2PnipVH+tA2okLWW90UN YK/BFf8rIAf9y9/FGQ16JTl3nEBJ/MahEeOfpBlHh+TGbMxyT3EbfPpUk4Sm9grnzt2z gZp/ofk3kXabjgpR2yA9JR5MjMdRURursj822tzChJxLFRvP1VLsc0LlKXQT0c6d+ti9 rSq3OGfAnGXEG0/5D0ATH2CgUFxhUIBl4ymOlV3u6DabbmQOrsaSODD0uljC0IGsD/tD OezEw1qzk81Eqwk/q90jugj+om1k4tatpOqQqvVcsUpFq19K3NW2VUO7WrhFuFTXTL0G vZug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649203; x=1692254003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WNOB2kSBm/ZCjLUQLsGBk0BsOPSn2yUKgs+5rBFTqgc=; b=imGwqKSkqXsKvvPy9opqhqG+3rNRbcHfjPJuEo9VVDS9wEyGdYPDNyoIyyKprFOpzB IOJaSiDuDHMm1r9swbMnIiSgPZ4wI86kzy2r7hzAjQcN+VpfcagoWiDYaUNs6fHja58F z5nXQSWsLrvWELkqGhH92+9yqFzrfYC0GolLDTboR/j2ZduqPdaP1qeyKyWuDBMnhZ1f TnHLUQmoufKABI/I09Pw9Bzu6+YnOtGRTT915ZCE17l+dnhUjyRkIB0/PCtwFMYtHa5s v8XIDTAapWlUIhD6CTlk4/jNlgTQs2EOl3kMMnZUWe8Hr/yaaYutoJqRiynfcIV1CkVu SgsA== X-Gm-Message-State: AOJu0Yyk1z2+ZzU9PjGMf9ciup9yvt6kj3OQXFoiB83uemeiWqwAGsDL ANZer9M3JZUIvVOYDbz01Wy8Fg== X-Received: by 2002:a05:600c:d6:b0:3fe:1cac:37d7 with SMTP id u22-20020a05600c00d600b003fe1cac37d7mr1221145wmm.10.1691649203041; Wed, 09 Aug 2023 23:33:23 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:22 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 09/11] ASoC: samsung: midas_wm1811: parse audio-routing Date: Thu, 10 Aug 2023 08:32:57 +0200 Message-Id: <20230810063300.20151-9-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773826698145743971 X-GMAIL-MSGID: 1773826698145743971 Parse generic sound card "audio-routing" property and fallback to "samsung,audio-routing" if it is missing. Signed-off-by: Krzysztof Kozlowski --- sound/soc/samsung/midas_wm1811.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index 6931b9a45b3e..9e83ed071f39 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -462,10 +462,14 @@ static int midas_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); if (ret < 0) { - dev_err(dev, "Audio routing invalid/unspecified\n"); - return ret; + /* Backwards compatible way */ + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + if (ret < 0) { + dev_err(dev, "Audio routing invalid/unspecified\n"); + return ret; + } } cpu = of_get_child_by_name(dev->of_node, "cpu"); From patchwork Thu Aug 10 06:32:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp252900vqi; Thu, 10 Aug 2023 00:50:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXUxo49rydVYtKKqA8idp3/eSoM/DT2T1ohonX92Zjz+Mna7Dpu9iiR7ZJjAp4RTIacQOF X-Received: by 2002:a05:6a00:2286:b0:687:4fa4:7f2e with SMTP id f6-20020a056a00228600b006874fa47f2emr1721100pfe.13.1691653842204; Thu, 10 Aug 2023 00:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691653842; cv=none; d=google.com; s=arc-20160816; b=uIU2WP9+Kju3Np65kO0TRV8EqRXt+5mrjBIvAhD4iUj/6/6s6xHqRSKobOSEW47Crv b7MnonPcwOsPujuNA1uvRokMblv8kIIwZJ+JbsJfrp29YUO+3hjhGh8I49hvmCCqUApl X9HU+OxPAkUiT735MUyaOrvDhJVyMidH853RvEj2JhKZMydMo+AbTEf5TBoVvyZH86Vq WTNKmamF0KYWiz7xD/o/PjjXzkmR0d6aAtQZBsxoLoc1ekz6wITvoKAwV9g8pNgPwKmH 89wtPR99TMrve+oJPYmeLKV/5qc/32MN+RRcNTwxPNIPKwkl/RjnGR/PzH/8askMc79P kLdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rMM3/oOp03VQdiM5UtFP36bUtHvT73/cLwCpo+QdiIw=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=qo7FJchlDHJeBIAHGQowdUkOuFVpJS5HJv2ic5lef3TXj3SEWIN+F6YXEcIJtgybst AA3x1EpNfA6pgIfNtj7C05k6jeQBMa7kpnXXSK1aIcrVehqFF+nYwbKJVAnSV/dsYcx3 QQlAPEDemLzFlaAcHeCt/XsqPsx2+vuR5GR1Cgb5NpuGEf/SbSn420PVP9qWcfyLREyU NNAcTEwxKC43sIxz/3DRYaqz8j9WIH6EnNpSsHoFCO3IGp1o5LJXUjgISwu59rk32i7W 8ZTBeeCYy2Jg1nngTxndKbtR7I5lI68UtzoWLY/CUFFE7uVI8KXX50FxVqt0VV6D2AfQ nE2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mZi34Ufd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v69-20020a638948000000b005539899e4cdsi1092900pgd.813.2023.08.10.00.50.29; Thu, 10 Aug 2023 00:50:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mZi34Ufd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233650AbjHJGdy (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233635AbjHJGdk (ORCPT ); Thu, 10 Aug 2023 02:33:40 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBA392704 for ; Wed, 9 Aug 2023 23:33:27 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b9aa1d3029so8773971fa.2 for ; Wed, 09 Aug 2023 23:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649206; x=1692254006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rMM3/oOp03VQdiM5UtFP36bUtHvT73/cLwCpo+QdiIw=; b=mZi34UfdwwcDjlmRaN1sPV1Che6maw8DFhkpB5rlbV0q8J/t0iDdS/XpmNucnylJ3O vyE0k7yv6OQFCEw9vAiWkjStNiV4ON3E3/xElpQ7NEq0kSZ1ViuYVDnrkY8Scyj/jCmb jMOEwrRNdGsT2TIXKhvOODWDSAvMvm54g8VBCVAnvSeidAP/qalWZRgxGeNBuPJ92nw9 OAweLoETqOOEX40mYzOkfOWLZce93VOvyJteawZl7vUCJVilbW5cz/YIXuaEECihqyoU sFSj748PEHeleeu7icxX4GlevJXwiCncCPSznc59NSRYeOwUMNOAXHaAgPqVO9/sqGF7 pR8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649206; x=1692254006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rMM3/oOp03VQdiM5UtFP36bUtHvT73/cLwCpo+QdiIw=; b=lKU9avlr0bEv7yoOGedxAiT7qKnvGr60+pY/fnWH88NKINSvOjrQTA3hqYrqZqyFyR 3RRClctThcPISmQGIOq/D+mIq761pZH4KPVag3BQQ9E17/NI057E0qM32YcmJk3ASWnA L0uT5/mxOw/ceDd2k2OFh8jSDORxy1UhbXRRkjwJbRpEaaBFi1m+uwlLzgGLiWYHjtty dbN5OJBKFFt9iyyRbrcKEbcQMl3xMlMbuFZsWYQzJwAFKSnB39lRwYVSOI+UqLD3wkuy APA9c4tokGyK4KW6ZeioRQTKWIoR6CjAv1izepdCwFz30nXnVuPM76/oH3O78f+EuxJw DBGg== X-Gm-Message-State: AOJu0YwyQOfPtrTpNSDI0acjm2cVDWwwVyXfM7OjsgQoMiOVbf3W+gZG lAHx311P7dMKHwsW42KbdalJqA== X-Received: by 2002:a2e:3203:0:b0:2b6:e3d5:76a7 with SMTP id y3-20020a2e3203000000b002b6e3d576a7mr974468ljy.24.1691649206283; Wed, 09 Aug 2023 23:33:26 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:25 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 10/11] ASoC: samsung: odroid: parse audio-routing Date: Thu, 10 Aug 2023 08:32:58 +0200 Message-Id: <20230810063300.20151-10-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773827619417429615 X-GMAIL-MSGID: 1773827619417429615 Parse generic sound card "audio-routing" property and fallback to "samsung,audio-routing" if it is missing. Signed-off-by: Krzysztof Kozlowski --- sound/soc/samsung/odroid.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 1743bd55ba1a..c93cb5a86426 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -230,12 +230,13 @@ static int odroid_audio_probe(struct platform_device *pdev) return ret; } - if (of_property_present(dev->of_node, "samsung,audio-routing")) { - ret = snd_soc_of_parse_audio_routing(card, - "samsung,audio-routing"); - if (ret < 0) - return ret; - } + ret = 0; + if (of_property_present(dev->of_node, "audio-routing")) + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); + else if (of_property_present(dev->of_node, "samsung,audio-routing")) + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + if (ret < 0) + return ret; card->dai_link = odroid_card_dais; card->num_links = ARRAY_SIZE(odroid_card_dais); From patchwork Thu Aug 10 06:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp248658vqi; Thu, 10 Aug 2023 00:39:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAWnCzMIMgBBwaNPBM9WpRheIS8YUD6uDnw81yR2jjE+ItGNIy3NIBv2gXtfkGIQExHq0Q X-Received: by 2002:a05:6808:23c3:b0:3a7:390c:4c43 with SMTP id bq3-20020a05680823c300b003a7390c4c43mr1873510oib.50.1691653177758; Thu, 10 Aug 2023 00:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691653177; cv=none; d=google.com; s=arc-20160816; b=bIWCss8Es2iiihAb71bWyQ4Z/h82LUHdYl2JLbMXxmIJlSRsX+jS9TrGTQ22w9Tnz/ 5Gc2owvnPGD++yRF1IZZTxXmLmRs4G68wzuPM3wS8tna7xJLpgh2ueJziFSYbBSnFhWt rvTeiU5KlazA2gnOCyrPjgaFgi5biKjZhswhfvKDsRwxwT6qNMFPazzMom/o25ccVMMm b26YhAi0g4IE3Xn6FKTaIy0eeGNtrPQhCoyFAgzoBvfuKFny78eKqYAMeHdzgSvbdfDC dM61OmvaDKBgey5OuEcDu/1K1H0meGVbWfqZC2F2zKYl8dCCU9JM3AqYd7SwVPDBxQT3 Xg/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/WBYHWBePTU6C5eucIxmnpm6TRHg4GxWEuDC87hbIx8=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=C1RUXvop2A+VHPpzIcAJcb/QMacn4yvBKxWcPfoBdSi7IQanrPBPhdbKyckBVfup+m RZgZe/JgJE90TlZUrWPQpWBsUBH3gK0fb9zARh6mnrdegsO/iLh7k3yKwQq84mjJPlou cNDICUApcDcy6z7RW9tzilMlo74O4B053QmqDyQLNzF01gTPtcSvCnD1e+p1WNLkvdxs UokJcGhikkGcB2zL4G17neKv9AhZTFeEcyVk99QO9kphOCJscVkmgYJbe0rdfhTOnxaF 8LXMr12p4gnr3RqpLNYT05xAc6NyHvZnQMQf3txOzmCGE1UTsyJhu8PzDhRYdoarq4g5 xSrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WsW7N5hH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x2-20020a17090a8a8200b00263cfc9753csi3249121pjn.5.2023.08.10.00.39.25; Thu, 10 Aug 2023 00:39:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WsW7N5hH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233824AbjHJGd6 (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233771AbjHJGdl (ORCPT ); Thu, 10 Aug 2023 02:33:41 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBCAE2719 for ; Wed, 9 Aug 2023 23:33:29 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe5eb84dceso4802805e9.1 for ; Wed, 09 Aug 2023 23:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649208; x=1692254008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/WBYHWBePTU6C5eucIxmnpm6TRHg4GxWEuDC87hbIx8=; b=WsW7N5hH568pRQc1HRO3Dph5sZBjMP7VCQ9PCz17RKguEShZUyFktuqumSMowNXnNL eZS7dxaBqYwAANnxZaDYAmepUMVya8yW7kPjBBApwlk7OvvMjJEZO7H+FbP07j4yW/Q9 v+OQWgdu1hwGASwjeScs1jrTLWsV+ZWk6T7EU3sxTyt8AmDwR3GSouEMghCxR7wTB4+l QyKQhIQUJpsbbZm1bTH7OH4EwIzoF2l1A+au4POCQyT1uXwMkgZcMkz5b1mxwoyN3S41 HQkoW65jAh72hsl2jei/YeCfL+DOSWqvIbvOk1YayxqYBkf7jfR67GAuRMcFIDR1qauT ezqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649208; x=1692254008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/WBYHWBePTU6C5eucIxmnpm6TRHg4GxWEuDC87hbIx8=; b=BItk5jOUBoEFc4lakc7xF8a22Wj8MKdjCS38KjGhrIUUQEW0Z5/9BiaH/pca+Bl3Hq 4kEt2NFfun9NV67jblXUgKqkUM1Hnj44PshvPQMVvefzDwGv+RHdAK7pLQJVQSFGj7rZ eAG4iBB/G+g+R2/KgPeqof2FxaRRYFapSu9RS5kJOd3scFDQWSN4YNJ7NlBtmAM/jDtN 03MC8TGMFVz38EMj5hHRe55JiLzJlJ7zrIGV8jR8aGdmoUaH+/edLcKug0S/a0AzPILO OKEp/OMUCHrQBwz8VWiYdyTB20aeftCw7m8NpA0+qkkC/CUf77610WukkAtLxx/3WWqu Mdxw== X-Gm-Message-State: AOJu0YyrJlltMcS241L+1zDZm5EPRvkhPCFsrT51cXXQtnF1wjNXQCMG yDLiYC+XVtu32CZpjmPpXacOCg== X-Received: by 2002:a7b:ce8e:0:b0:3fe:2109:b9ff with SMTP id q14-20020a7bce8e000000b003fe2109b9ffmr1127175wmj.0.1691649208491; Wed, 09 Aug 2023 23:33:28 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003fe2b6d64c8sm4020018wmc.21.2023.08.09.23.33.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:28 -0700 (PDT) From: Krzysztof Kozlowski To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Sylwester Nawrocki , Jaroslav Kysela , Takashi Iwai , Shengjiu Wang , Rohit kumar , Cheng-Yi Chiang , Rao Mandadapu , Judy Hsiao , Trevor Wu , Jonathan Bakker , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 11/11] ASoC: samsung: tm2_wm5110: parse audio-routing Date: Thu, 10 Aug 2023 08:32:59 +0200 Message-Id: <20230810063300.20151-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> References: <20230810063300.20151-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773826922620944643 X-GMAIL-MSGID: 1773826922620944643 Parse generic sound card "audio-routing" property and fallback to "samsung,audio-routing" if it is missing. Signed-off-by: Krzysztof Kozlowski --- sound/soc/samsung/tm2_wm5110.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index d611ec9e5325..5ebf17f3de1e 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -523,10 +523,14 @@ static int tm2_probe(struct platform_device *pdev) return ret; } - ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); if (ret < 0) { - dev_err(dev, "Audio routing is not specified or invalid\n"); - return ret; + /* Backwards compatible way */ + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + if (ret < 0) { + dev_err(dev, "Audio routing is not specified or invalid\n"); + return ret; + } } card->aux_dev[0].dlc.of_node = of_parse_phandle(dev->of_node,