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