From patchwork Mon Jul 31 09:42: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: 128561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1927978vqg; Mon, 31 Jul 2023 03:49:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHFUTnRbB+9EiUBukL+AjkzXYOCtvNkOWvSGmiCaKMetBKSSzebIWRV2/gZhVQW6HbIaEGq X-Received: by 2002:a1f:3f83:0:b0:486:3f9b:8ff9 with SMTP id m125-20020a1f3f83000000b004863f9b8ff9mr4640702vka.0.1690800549853; Mon, 31 Jul 2023 03:49:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690800549; cv=none; d=google.com; s=arc-20160816; b=D3DwQUr/fmfZAyx0YE/s8UEDYZRX2MgldGFOF5ET56sVjNUmWwIt3mtGOgGfCruhIh G9LMmp0j2CbLqE9eIJ07u2J+uzIpHPbSEyer0VgcB1LGPl0JZOiC9LTq4Q2i/G9bKwdN 8NylAkAWKTRbeaU9ISjsJuywwSUq7m3iv4jmzfR8Q7dJ+FevLCYGYR8gDpdk6i/3cq0g kGVzTtrLZsnJVly3cDEwJtfBefU4t3kEgREvgi/MLurM8+jpgBbtzr40Cyz774snr8wR grNXLofCBOP29Klu9LDe9mlFU7s4lkdK5FNRRxTcYw1LUHs6w1RR6DR9d8h4cIZ4xyzA tLnw== 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=Wru1VW4ElNQWwbcOi9qEWUoTt9rJrkxi91n6SS30Eys=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=fiMAvDo58R4XeiSUMGSH30tt0wDxmQE2gJCl4UFceAf0lSG4j5uwxQsdZLVylfbIlr Eco3VEis0s0qlbwcia4Sq62rYm/L+qeoQqXoeYgJFR99XkcpT6yl9owMiOYLotAPE4uq nd0jqomafyWDhkH+oDss0FG3ej+CzlgfgtG6j9LjzsQTuk/HIm/jfJMrbzPYFNFoEKMP /3oh/KRojAJcKgoDaMhFnEkVRJj8C/Lx3xehDJyH2ddGhzUpzSWO6ylHr3AaZS1VSNhK lQuZqysWe/J7XyFVjwlbO6hTXrX5fvDX05fXmx2y4xZtGAQLAYAuL8Hflf+05mNqUf1p pLSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cQcWGSDw; 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 w8-20020a17090abc0800b002685065230asi2367422pjr.37.2023.07.31.03.48.57; Mon, 31 Jul 2023 03:49:09 -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=cQcWGSDw; 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 S232398AbjGaJn4 (ORCPT + 99 others); Mon, 31 Jul 2023 05:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231675AbjGaJno (ORCPT ); Mon, 31 Jul 2023 05:43:44 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 285AFE68 for ; Mon, 31 Jul 2023 02:43:26 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso566547266b.1 for ; Mon, 31 Jul 2023 02:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690796605; x=1691401405; 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=Wru1VW4ElNQWwbcOi9qEWUoTt9rJrkxi91n6SS30Eys=; b=cQcWGSDwLdxq6R599X8W8DBqRHuUQ8TLEqRJdVpH+ad9PFCr2UnbMtcYleek6ZoOCI FVRgDKR2kHfjVYGCLkcl/rAZAB22kuyPcohETwQdscluc5L9m05Jff7UIqxl5a1qyQcb x7uikvpX2QobNa8Vem/M/kyHaCVV0ietA89zOVLby2150vsXNHLnCqtl3Nt4cQat43Oi 8weD//QJ47qnCd2XAIV6nxsKkjeO4rynyJnz3TYOg1INHmHjLs1+rauPrfuvxY/rdY7x QMSjMpmzmchtdKaS/mVJwQNk/0wMuEP7pvgeaIII9ibFlpr3OhRiz4yW/S9tJuPIuvuQ WDdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690796605; x=1691401405; 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=Wru1VW4ElNQWwbcOi9qEWUoTt9rJrkxi91n6SS30Eys=; b=VNLQCA8MiTdGVUygd+/Y1W2O01Or+uHNOpTCzNd+144dt+zlHqQkk7D4JPNdzi4NIo iyUcMZ7CePhlcyp2VNcqmpVeuUcYbkHHxxOZFXVxfies6HFwK+krC3VLa/CWmv3X1PQq 38ZPe8UO+SxdYq5G9F6FxRuLtxarw2yWNr7wYu+dIW+cjhUnrENjPupWDTyR7K3hw8bE pkcfjxokjn2AymqI/vL7imddcjBaV+13ftEO3OCqBgDCLzBmTFftDcBbQwTJgCs9FsoB Vz71Jr2OxKcueqzI0lvhszg8TBFe2F8+UaU72RPKcJxwtWsnZdkBkVr667Rgb+4dt7iP ajKg== X-Gm-Message-State: ABy/qLbnJYnb/05F3VtujrIOvRRF7bMMoWrOa4LlIM7Y6cw2639TJ/ZK GcEsYRBbHKgLHmiHG5yAs1PrKQ== X-Received: by 2002:a17:906:7397:b0:99b:6c47:1145 with SMTP id f23-20020a170906739700b0099b6c471145mr6069053ejl.32.1690796605096; Mon, 31 Jul 2023 02:43:25 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:43:24 -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 05/12] ASoC: dt-bindings: samsung,midas-audio: use common sound card Date: Mon, 31 Jul 2023 11:42:56 +0200 Message-Id: <20230731094303.185067-6-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=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: 1772932877162614536 X-GMAIL-MSGID: 1772932877162614536 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 Reviewed-by: Rob Herring --- .../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",