From patchwork Thu Aug 10 06:32:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133737 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp252900vqi; Thu, 10 Aug 2023 00:50:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXUxo49rydVYtKKqA8idp3/eSoM/DT2T1ohonX92Zjz+Mna7Dpu9iiR7ZJjAp4RTIacQOF X-Received: by 2002:a05:6a00:2286:b0:687:4fa4:7f2e with SMTP id f6-20020a056a00228600b006874fa47f2emr1721100pfe.13.1691653842204; Thu, 10 Aug 2023 00:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691653842; cv=none; d=google.com; s=arc-20160816; b=uIU2WP9+Kju3Np65kO0TRV8EqRXt+5mrjBIvAhD4iUj/6/6s6xHqRSKobOSEW47Crv b7MnonPcwOsPujuNA1uvRokMblv8kIIwZJ+JbsJfrp29YUO+3hjhGh8I49hvmCCqUApl X9HU+OxPAkUiT735MUyaOrvDhJVyMidH853RvEj2JhKZMydMo+AbTEf5TBoVvyZH86Vq WTNKmamF0KYWiz7xD/o/PjjXzkmR0d6aAtQZBsxoLoc1ekz6wITvoKAwV9g8pNgPwKmH 89wtPR99TMrve+oJPYmeLKV/5qc/32MN+RRcNTwxPNIPKwkl/RjnGR/PzH/8askMc79P kLdw== 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=rMM3/oOp03VQdiM5UtFP36bUtHvT73/cLwCpo+QdiIw=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=qo7FJchlDHJeBIAHGQowdUkOuFVpJS5HJv2ic5lef3TXj3SEWIN+F6YXEcIJtgybst AA3x1EpNfA6pgIfNtj7C05k6jeQBMa7kpnXXSK1aIcrVehqFF+nYwbKJVAnSV/dsYcx3 QQlAPEDemLzFlaAcHeCt/XsqPsx2+vuR5GR1Cgb5NpuGEf/SbSn420PVP9qWcfyLREyU NNAcTEwxKC43sIxz/3DRYaqz8j9WIH6EnNpSsHoFCO3IGp1o5LJXUjgISwu59rk32i7W 8ZTBeeCYy2Jg1nngTxndKbtR7I5lI68UtzoWLY/CUFFE7uVI8KXX50FxVqt0VV6D2AfQ nE2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mZi34Ufd; 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 v69-20020a638948000000b005539899e4cdsi1092900pgd.813.2023.08.10.00.50.29; Thu, 10 Aug 2023 00:50:42 -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=mZi34Ufd; 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 S233650AbjHJGdy (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233635AbjHJGdk (ORCPT ); Thu, 10 Aug 2023 02:33:40 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBA392704 for ; Wed, 9 Aug 2023 23:33:27 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b9aa1d3029so8773971fa.2 for ; Wed, 09 Aug 2023 23:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649206; x=1692254006; 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=rMM3/oOp03VQdiM5UtFP36bUtHvT73/cLwCpo+QdiIw=; b=mZi34UfdwwcDjlmRaN1sPV1Che6maw8DFhkpB5rlbV0q8J/t0iDdS/XpmNucnylJ3O vyE0k7yv6OQFCEw9vAiWkjStNiV4ON3E3/xElpQ7NEq0kSZ1ViuYVDnrkY8Scyj/jCmb jMOEwrRNdGsT2TIXKhvOODWDSAvMvm54g8VBCVAnvSeidAP/qalWZRgxGeNBuPJ92nw9 OAweLoETqOOEX40mYzOkfOWLZce93VOvyJteawZl7vUCJVilbW5cz/YIXuaEECihqyoU sFSj748PEHeleeu7icxX4GlevJXwiCncCPSznc59NSRYeOwUMNOAXHaAgPqVO9/sqGF7 pR8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649206; x=1692254006; 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=rMM3/oOp03VQdiM5UtFP36bUtHvT73/cLwCpo+QdiIw=; b=lKU9avlr0bEv7yoOGedxAiT7qKnvGr60+pY/fnWH88NKINSvOjrQTA3hqYrqZqyFyR 3RRClctThcPISmQGIOq/D+mIq761pZH4KPVag3BQQ9E17/NI057E0qM32YcmJk3ASWnA L0uT5/mxOw/ceDd2k2OFh8jSDORxy1UhbXRRkjwJbRpEaaBFi1m+uwlLzgGLiWYHjtty dbN5OJBKFFt9iyyRbrcKEbcQMl3xMlMbuFZsWYQzJwAFKSnB39lRwYVSOI+UqLD3wkuy APA9c4tokGyK4KW6ZeioRQTKWIoR6CjAv1izepdCwFz30nXnVuPM76/oH3O78f+EuxJw DBGg== X-Gm-Message-State: AOJu0YwyQOfPtrTpNSDI0acjm2cVDWwwVyXfM7OjsgQoMiOVbf3W+gZG lAHx311P7dMKHwsW42KbdalJqA== X-Received: by 2002:a2e:3203:0:b0:2b6:e3d5:76a7 with SMTP id y3-20020a2e3203000000b002b6e3d576a7mr974468ljy.24.1691649206283; Wed, 09 Aug 2023 23:33:26 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:25 -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 v2 10/11] ASoC: samsung: odroid: parse audio-routing Date: Thu, 10 Aug 2023 08:32:58 +0200 Message-Id: <20230810063300.20151-10-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: 1773827619417429615 X-GMAIL-MSGID: 1773827619417429615 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/odroid.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 1743bd55ba1a..c93cb5a86426 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -230,12 +230,13 @@ static int odroid_audio_probe(struct platform_device *pdev) return ret; } - if (of_property_present(dev->of_node, "samsung,audio-routing")) { - ret = snd_soc_of_parse_audio_routing(card, - "samsung,audio-routing"); - if (ret < 0) - return ret; - } + ret = 0; + if (of_property_present(dev->of_node, "audio-routing")) + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); + else if (of_property_present(dev->of_node, "samsung,audio-routing")) + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + if (ret < 0) + return ret; card->dai_link = odroid_card_dais; card->num_links = ARRAY_SIZE(odroid_card_dais);