From patchwork Mon Jul 31 09:42: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: 128571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1929712vqg; Mon, 31 Jul 2023 03:53:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlEgKYH7Q5cBdn6FyDfL5TDZdr1zC9kMuZUeB0RH+/V4Cv2lgGezkiEeSxZIMYGjZ7ot4dT5 X-Received: by 2002:a05:6358:c2a:b0:139:d47e:40dd with SMTP id f42-20020a0563580c2a00b00139d47e40ddmr215946rwj.0.1690800820419; Mon, 31 Jul 2023 03:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690800820; cv=none; d=google.com; s=arc-20160816; b=e2Ouei/Nk0yW8qDX5AYqSeE0n8X8hd7PYXgmN+yg3ll/XBvc2TinsRpylPHfPR90v4 XcdkCLDntiEMT2G1x4yPIKGfJ35esdyn7a8LqQ3/Kb5lTV+1/j9UjEnItvah1ICTA+PS BTbWDifyVEO2c5z94DdLwLzMmwkJLbJTK5NKDhDwB8kU5RpgsdS4DKgzCnCYX/OBPsJf MPUtw+dJctIAHqI09Wtzvte0w/mb39S2tdOnDDBZEdZfNOXgX79MDBnbq89ruGSgaLFe uyRuktl214P7vS7VbCgdr7/v5miKPi57oCe+Ad//zZ5Hnn63uAIoVvg8Eanpp5kH90qf qNTA== 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=lwoyTPSO3cjBsRDQcDo5mpbjNKMn5OZoqnqGWdyjQow=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=nfxM0A4b/nkmy8D+ZnMwAPWgziHlXU4YDjSI4lzh3kBp637EMZ6ivvh/M95h+3scOF ggd9REJMxAqzkQc4QyRAYjcEIYMyjioBqSCUhp3f7tKhZP8mnzfEJOkkPEnbvVa24FHD sbGSu3+ZyZLWRGne29FKJ1ji3lwqpvdSSpKbeDsiT9Md5nJq1p6vVGD1MlDS+S7yLFvL Zdxh84DDXcuzGdOYs3lqurGNW22J66cTxupcwcgsDOugUTaHxzXQ1OvznGQjtlxL8NZ+ sW0t9dHmevYqGI83MggaFjyWnC5YT5BJSbY7ynZlRLymwvr7W/7DQgdD2IxZyTGQNZzV t4uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mBBfShQZ; 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 16-20020a631650000000b00563b0cbe820si6837212pgw.688.2023.07.31.03.53.27; Mon, 31 Jul 2023 03:53: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=mBBfShQZ; 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 S232349AbjGaJoE (ORCPT + 99 others); Mon, 31 Jul 2023 05:44:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232330AbjGaJnr (ORCPT ); Mon, 31 Jul 2023 05:43:47 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3718E171F for ; Mon, 31 Jul 2023 02:43:30 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-99bdd262bb0so626759566b.3 for ; Mon, 31 Jul 2023 02:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690796608; x=1691401408; 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=lwoyTPSO3cjBsRDQcDo5mpbjNKMn5OZoqnqGWdyjQow=; b=mBBfShQZv6XkwK8DnO85tXUWcVxUGA70V8N35lmh4HqedyJgROliBumCPfl4HCc7kZ ZCiRe3k62XNvWAeb7DquDbRAEx8I8tdOT7FsETyG0ubi+s4xm3Tf6ddfaEgtpSaQ4xsA QtbMe6OaGPb66nAkX8cz0CsQhgeSvuntlD4l8wW4cIe5eWVVuTFWRToaGWaJ3ihg9DcF oQVPpdEB7MSm4H6KpxQdW/JXZP0eH6h4GhbOTLpjBa9FpJZMT1w+67c90pYhqEnVnwxL bGI6uFmMUVdTD+q43fD1KjEdyMRZl4LSqwYcXUZVw56Oxr5mNEDZjBXuYWgYM6fVIQgk 98UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690796608; x=1691401408; 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=lwoyTPSO3cjBsRDQcDo5mpbjNKMn5OZoqnqGWdyjQow=; b=Oc1gXtbV4LgcYt8XOdX10J2bZCtMnuNnVHkUuK7ALRe8+7fioLPLwiXlah7WE8G6V5 gfcTp5lDOnxvjyAbvSbhl92Ds2l5hkoJK9HtjQJ7MVW7mOpNe8g6Cdsw5HzTKnCul5fd 8LgYFBo3Hedki1HSvo5EWclhsViV4Xydc9KUsqAeX6QNX4cyEnhVyDMzwAAy1xMVpelh THxAxKzFmip99mp7v4HSd1dAa4MU3SOMVnh6BcZolnUhgBzKl+kyiIjW6omHEtiOu1NB 3FSWydRfsN7JuwQ+anbUGWu/Vk7YHd5ss4LWQd7w3h9Nbjqo8ZBGygKw2jaIwBwVO3xF T0lQ== X-Gm-Message-State: ABy/qLbcQ7lAQGX0jqtSiCK+cdVvZoLvUEmpEp2MVgTxy22IVljFlYKm xDpiR55+0e8ytHJyZLOND5vyXg== X-Received: by 2002:a17:906:5d:b0:99b:4b4f:c9de with SMTP id 29-20020a170906005d00b0099b4b4fc9demr6736292ejg.36.1690796608017; Mon, 31 Jul 2023 02:43:28 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id z17-20020a170906815100b0099bcdfff7cbsm5867547ejw.160.2023.07.31.02.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:43:27 -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 06/12] ASoC: dt-bindings: samsung,odroid: use common sound card Date: Mon, 31 Jul 2023 11:42:57 +0200 Message-Id: <20230731094303.185067-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731094303.185067-1-krzysztof.kozlowski@linaro.org> References: <20230731094303.185067-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,T_SCC_BODY_TEXT_LINE 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: 1772933161337661230 X-GMAIL-MSGID: 1772933161337661230 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. 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",