From patchwork Mon Jul 31 09:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1944363vqg; Mon, 31 Jul 2023 04:21:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlFPLZVbF9DST68PF5RfK61GIxEeW95MZEc49to+KEZEMndjbMLkYnI6tx+vL2s52PBoKrPP X-Received: by 2002:aa7:c554:0:b0:522:40dd:74f3 with SMTP id s20-20020aa7c554000000b0052240dd74f3mr9441566edr.39.1690802508174; Mon, 31 Jul 2023 04:21:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690802508; cv=none; d=google.com; s=arc-20160816; b=LLRlHFWg2Y1Opq+WIdevNkVxLBINAjHNq7HL/lKU54B9VL3pJhOyHIsxwii7ArqjBZ sB77RuGOnryZkRTUkVkM56rDgRCcLv7J86mmeq6aXe/yShoG/L8pJK3N/B0RjUcHWOGu GoN/ue0Hu7HasxLVgDnUOF4Bvqafw2Oy/Fj0qoUSEXDK3kLBIDjrqMBS9UWHlf1HLN/a z80QEursv1JRmpdUSVqY2N3RByFc7t+2z4vn/iKuLzwBc/xpvIeYHP3xmjSHZ3v5GrKF 3cIYk+2G+jj94Xj5or89QT/80M5pYzpSt4gudnBh82iw+fQTHys0xrqVK5/U402vuamz VesQ== 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=JJz6byXpfa5LtbT1vEid93zlx1yI7t47SdprfU7gIVdCeOaqNyz75Vq+ikEXc/mpV1 gclofl2YROopvPc3XmlC2SYsO5B9tgbP0dreYhSj0ShtZ13o0iembXHXkGStSa9PJk19 AAX57JL+yJ9w1IDegHHMcOq9JmZgwMEppSPE/d/9pC0HtKoAAAaAP1l1zEiCtoiA7RsP l1JAYVzobnvgm60ClnvFGF+DhEhzy/vd3j2Ly6rT3hdHMB+gr/z/Su4DeIzRbR4CwRbi u8EvfBm1+mYt4MsD8vDdWv7fLukyB4xZ64TE79smt6ngrkBH5sauDtlHTdBWkmfeKHfM G7KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p9WGqBEO; 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 n11-20020aa7c68b000000b0052246a57e0esi4045754edq.1.2023.07.31.04.21.23; Mon, 31 Jul 2023 04:21:48 -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=p9WGqBEO; 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 S232402AbjGaJpP (ORCPT + 99 others); Mon, 31 Jul 2023 05:45:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232403AbjGaJop (ORCPT ); Mon, 31 Jul 2023 05:44:45 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DB291986 for ; Mon, 31 Jul 2023 02:44:19 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31792ac0fefso1517714f8f.2 for ; Mon, 31 Jul 2023 02:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690796640; x=1691401440; 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=p9WGqBEO1R9VytlRHDo/HZ1uwShHN2SLVI387g5girhq6M+o1kwBxUZv1AcVFHO8Zl hG1jYTwRo4HiCvEzYeT6Cu5viDEEP4GkBaQJOTulYCry4Wqh+vGZhAHrapnloCz9Lvvr 1TXg8jwln8Vxcxz8abcB8L3W4+dAi2xKxTQ+rTLPhf+EDoAsnmfHs8aAPQCLVzp8+Lv6 qwWuLxTlvkthajwdZQbw009GUatqRqs4SdJaANqsMg8CAYhbYVwcx6mkAOntqPz29yFT /6mu7gvqHCVmr33Yo9o3CHJP2Dc0dqyuEp7Qk9BsGQWw7lbgqiGZNd+zG1D/Af6LeUPc Iolg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690796640; x=1691401440; 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=Mbag8UaT1FIiWyIxP28gNChVCButKb8gTkLBAY19fcXSCnt+dVwJtVzodG/8qpW48Y oS1Ygw9klD41OBgfqm0uNQ3p3IgVPgaWOQnihudH72A28P40qXxThdmwkUzC/Qbf1QOb YiaAD5ygAciRrRMgQh65GcdUGV2pU1yyfr52dOiww6o7DnHIAbsd2yxRHwo9hKh897jn yfCxqNIg4CzHqk1vAtzyFh6dEQrKVvp1/sbdMyrhIpWzOoNsYEFk6fsU1GgWhgffPEMC Pk0sgMbmp8lfs+qR6MKfKjMmY7E460vT5Ia/jHQXABtW8bVooKMt2bfD4p6tQuauqI2f hy6Q== X-Gm-Message-State: ABy/qLbYk7Bm03+DazoM5JLvTrVzj2GM1D8ysj6i4/MjnikkJRR2prAu kSHJ/awDybmtNf5nsfvnIPOtLzHaWu3J3cGxkMo= X-Received: by 2002:a2e:9557:0:b0:2b9:eeaa:1072 with SMTP id t23-20020a2e9557000000b002b9eeaa1072mr1013157ljh.18.1690796619353; Mon, 31 Jul 2023 02:43:39 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:43:38 -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 10/12] ASoC: samsung: midas_wm1811: parse audio-routing Date: Mon, 31 Jul 2023 11:43:01 +0200 Message-Id: <20230731094303.185067-11-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_NONE, 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: 1772934930452535585 X-GMAIL-MSGID: 1772934930452535585 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");