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",