From patchwork Thu Aug 10 06:32: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: 133724 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp247322vqi; Thu, 10 Aug 2023 00:36:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8h+SaoL0pxMtsOlb6AN4ZqqONbIlkKVFiSQHwqmWv4JXd1dFdmvnwAoRbxvFI8eRBCP7O X-Received: by 2002:a05:6358:91a4:b0:133:a55:7e26 with SMTP id j36-20020a05635891a400b001330a557e26mr1884180rwa.7.1691652963479; Thu, 10 Aug 2023 00:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691652963; cv=none; d=google.com; s=arc-20160816; b=wB6581XO2zF2GzyCl1O5Cmnq0Ik7Rgcs266CGMaaaOWoIM8qxezMta7w+P9s9yS0Hs M7VtQWQ6BR7f7rHfStoEtFViJgEMSIO0KXDPrEIimwxMrzrY5BrmSWb86F01NNgjYaUP YMkcfyPMKq1A9RSWnRi97nWjqaB9slhAG7OSmdicw3AFY8aDcLMBZ+xlpTc+F2t6fqsh QLzAJb6sjdzWMDqJ8N6v7l8K6UlBhbfMLAMqatqMtltWxEHrSFE22Smvnx5vWNA7Xj8p UvKl8mIyc+QJ8rQPJ5D8qBpwGEFxc67ymsBUyJNgsGT59n/EW8nyvePYRmLJMOrshujP 81Bw== 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=Yto8CzBJDwHCadhT5wFkzXYFsvzzEjWAlklU/XxRPiyJyZThy3Q40r1uT7JPuHEVSi FL3QzvbFjtY1pCWQSfLCw8mWgmWW+jsd+34CDb8OU3bRPoxLdE9adYeWdc96dgBFhvTV 0o3+BuLjKngVUbkzTjZ9xbZc4GPgvdw3KIkTwaqlRGrpMgSiJIIsObcDdbEpn1BEahfV GlzTU97EHi+Z0elt1EigtwTdMd/bBrx1TJYTJrFx9w8HTtQhlIQzUPACh+8d0vxQ6Gn0 J00iPpqtEK94H3MoDVz/LOYPqZgmf6samBAzOPmPkZcBHICLcOrEbq/aSmHWpKQQM+Kj KHDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nLzSxmdC; 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 c6-20020a6566c6000000b00563fbbe378dsi1060542pgw.347.2023.08.10.00.35.48; Thu, 10 Aug 2023 00:36:03 -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=nLzSxmdC; 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 S233699AbjHJGds (ORCPT + 99 others); Thu, 10 Aug 2023 02:33:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233698AbjHJGdi (ORCPT ); Thu, 10 Aug 2023 02:33:38 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F7FA268C for ; Wed, 9 Aug 2023 23:33:24 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fe5eb84d43so4922855e9.3 for ; Wed, 09 Aug 2023 23:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691649203; x=1692254003; 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=nLzSxmdCld1p6/GNXMg8hXGakyqAdX2VctistK9WujPaXg2PnipVH+tA2okLWW90UN YK/BFf8rIAf9y9/FGQ16JTl3nEBJ/MahEeOfpBlHh+TGbMxyT3EbfPpUk4Sm9grnzt2z gZp/ofk3kXabjgpR2yA9JR5MjMdRURursj822tzChJxLFRvP1VLsc0LlKXQT0c6d+ti9 rSq3OGfAnGXEG0/5D0ATH2CgUFxhUIBl4ymOlV3u6DabbmQOrsaSODD0uljC0IGsD/tD OezEw1qzk81Eqwk/q90jugj+om1k4tatpOqQqvVcsUpFq19K3NW2VUO7WrhFuFTXTL0G vZug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691649203; x=1692254003; 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=imGwqKSkqXsKvvPy9opqhqG+3rNRbcHfjPJuEo9VVDS9wEyGdYPDNyoIyyKprFOpzB IOJaSiDuDHMm1r9swbMnIiSgPZ4wI86kzy2r7hzAjQcN+VpfcagoWiDYaUNs6fHja58F z5nXQSWsLrvWELkqGhH92+9yqFzrfYC0GolLDTboR/j2ZduqPdaP1qeyKyWuDBMnhZ1f TnHLUQmoufKABI/I09Pw9Bzu6+YnOtGRTT915ZCE17l+dnhUjyRkIB0/PCtwFMYtHa5s v8XIDTAapWlUIhD6CTlk4/jNlgTQs2EOl3kMMnZUWe8Hr/yaaYutoJqRiynfcIV1CkVu SgsA== X-Gm-Message-State: AOJu0Yyk1z2+ZzU9PjGMf9ciup9yvt6kj3OQXFoiB83uemeiWqwAGsDL ANZer9M3JZUIvVOYDbz01Wy8Fg== X-Received: by 2002:a05:600c:d6:b0:3fe:1cac:37d7 with SMTP id u22-20020a05600c00d600b003fe1cac37d7mr1221145wmm.10.1691649203041; Wed, 09 Aug 2023 23:33:23 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 23:33:22 -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 09/11] ASoC: samsung: midas_wm1811: parse audio-routing Date: Thu, 10 Aug 2023 08:32:57 +0200 Message-Id: <20230810063300.20151-9-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: 1773826698145743971 X-GMAIL-MSGID: 1773826698145743971 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");