From patchwork Thu Aug 10 06:32:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 133725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp248658vqi; Thu, 10 Aug 2023 00:39:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAWnCzMIMgBBwaNPBM9WpRheIS8YUD6uDnw81yR2jjE+ItGNIy3NIBv2gXtfkGIQExHq0Q X-Received: by 2002:a05:6808:23c3:b0:3a7:390c:4c43 with SMTP id bq3-20020a05680823c300b003a7390c4c43mr1873510oib.50.1691653177758; Thu, 10 Aug 2023 00:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691653177; cv=none; d=google.com; s=arc-20160816; b=bIWCss8Es2iiihAb71bWyQ4Z/h82LUHdYl2JLbMXxmIJlSRsX+jS9TrGTQ22w9Tnz/ 5Gc2owvnPGD++yRF1IZZTxXmLmRs4G68wzuPM3wS8tna7xJLpgh2ueJziFSYbBSnFhWt rvTeiU5KlazA2gnOCyrPjgaFgi5biKjZhswhfvKDsRwxwT6qNMFPazzMom/o25ccVMMm b26YhAi0g4IE3Xn6FKTaIy0eeGNtrPQhCoyFAgzoBvfuKFny78eKqYAMeHdzgSvbdfDC dM61OmvaDKBgey5OuEcDu/1K1H0meGVbWfqZC2F2zKYl8dCCU9JM3AqYd7SwVPDBxQT3 Xg/w== 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=/WBYHWBePTU6C5eucIxmnpm6TRHg4GxWEuDC87hbIx8=; fh=m9X5aB0f8c38W2l9WQSH90OWHkEvKc7ayn1zeer5Giw=; b=C1RUXvop2A+VHPpzIcAJcb/QMacn4yvBKxWcPfoBdSi7IQanrPBPhdbKyckBVfup+m RZgZe/JgJE90TlZUrWPQpWBsUBH3gK0fb9zARh6mnrdegsO/iLh7k3yKwQq84mjJPlou cNDICUApcDcy6z7RW9tzilMlo74O4B053QmqDyQLNzF01gTPtcSvCnD1e+p1WNLkvdxs UokJcGhikkGcB2zL4G17neKv9AhZTFeEcyVk99QO9kphOCJscVkmgYJbe0rdfhTOnxaF 8LXMr12p4gnr3RqpLNYT05xAc6NyHvZnQMQf3txOzmCGE1UTsyJhu8PzDhRYdoarq4g5 xSrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WsW7N5hH; 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 x2-20020a17090a8a8200b00263cfc9753csi3249121pjn.5.2023.08.10.00.39.25; Thu, 10 Aug 2023 00:39:37 -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=WsW7N5hH; 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 S233824AbjHJGd6 (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233771AbjHJGdl (ORCPT ); Thu, 10 Aug 2023 02:33:41 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBCAE2719 for ; Wed, 9 Aug 2023 23:33:29 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe5eb84dceso4802805e9.1 for ; Wed, 09 Aug 2023 23:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649208; x=1692254008; 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=/WBYHWBePTU6C5eucIxmnpm6TRHg4GxWEuDC87hbIx8=; b=WsW7N5hH568pRQc1HRO3Dph5sZBjMP7VCQ9PCz17RKguEShZUyFktuqumSMowNXnNL eZS7dxaBqYwAANnxZaDYAmepUMVya8yW7kPjBBApwlk7OvvMjJEZO7H+FbP07j4yW/Q9 v+OQWgdu1hwGASwjeScs1jrTLWsV+ZWk6T7EU3sxTyt8AmDwR3GSouEMghCxR7wTB4+l QyKQhIQUJpsbbZm1bTH7OH4EwIzoF2l1A+au4POCQyT1uXwMkgZcMkz5b1mxwoyN3S41 HQkoW65jAh72hsl2jei/YeCfL+DOSWqvIbvOk1YayxqYBkf7jfR67GAuRMcFIDR1qauT ezqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649208; x=1692254008; 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=/WBYHWBePTU6C5eucIxmnpm6TRHg4GxWEuDC87hbIx8=; b=BItk5jOUBoEFc4lakc7xF8a22Wj8MKdjCS38KjGhrIUUQEW0Z5/9BiaH/pca+Bl3Hq 4kEt2NFfun9NV67jblXUgKqkUM1Hnj44PshvPQMVvefzDwGv+RHdAK7pLQJVQSFGj7rZ eAG4iBB/G+g+R2/KgPeqof2FxaRRYFapSu9RS5kJOd3scFDQWSN4YNJ7NlBtmAM/jDtN 03MC8TGMFVz38EMj5hHRe55JiLzJlJ7zrIGV8jR8aGdmoUaH+/edLcKug0S/a0AzPILO OKEp/OMUCHrQBwz8VWiYdyTB20aeftCw7m8NpA0+qkkC/CUf77610WukkAtLxx/3WWqu Mdxw== X-Gm-Message-State: AOJu0YyrJlltMcS241L+1zDZm5EPRvkhPCFsrT51cXXQtnF1wjNXQCMG yDLiYC+XVtu32CZpjmPpXacOCg== X-Received: by 2002:a7b:ce8e:0:b0:3fe:2109:b9ff with SMTP id q14-20020a7bce8e000000b003fe2109b9ffmr1127175wmj.0.1691649208491; Wed, 09 Aug 2023 23:33:28 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:28 -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 11/11] ASoC: samsung: tm2_wm5110: parse audio-routing Date: Thu, 10 Aug 2023 08:32:59 +0200 Message-Id: <20230810063300.20151-11-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: 1773826922620944643 X-GMAIL-MSGID: 1773826922620944643 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/tm2_wm5110.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index d611ec9e5325..5ebf17f3de1e 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -523,10 +523,14 @@ static int tm2_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 is not specified or invalid\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 is not specified or invalid\n"); + return ret; + } } card->aux_dev[0].dlc.of_node = of_parse_phandle(dev->of_node,