From patchwork Fri Dec 1 13:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 172495 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1133097vqy; Fri, 1 Dec 2023 05:53:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHFgVrr6/kg1HESxv/TN+F3cBThvgcQebzfLJK89OTMstBMwxhaEseG/0vrJy3DtFmTkak+ X-Received: by 2002:a05:6358:5285:b0:16e:579a:4d6b with SMTP id g5-20020a056358528500b0016e579a4d6bmr11514990rwa.18.1701438828391; Fri, 01 Dec 2023 05:53:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701438828; cv=none; d=google.com; s=arc-20160816; b=RJn9MO6a2no6MjpLMyf6WwfsNul+oUs8N06NZodUmsFpXoxDOYDb+k4GWFGiTXv41n z/gT/uIlcfPCtNTIEkBjkbdCqOsJmVRBQH4SUQIaYmWlaFjHNpPo4HYzxbOVyYRYSNzp 1B5AKBRPyx8CjqnTeV9N8AmgPesyXD/KU6oeLu2kWBn+BzHyo9tYPWj3u2Bwa9YpK5Ny odqOkB1lawTWsyaK/l8gyHiwpeAxqtSUkEtZ1aMFeeOJG93MF5NJ6WKNb8QXeeE60PkU 3AAu+oYStXTskmrJwAPzWCr0bkVrWiU+X8JHkbVMK8FjPnZY37BEZqYDkzZfV5GcT8JP YAwA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=P7K5IV7jdfgIwO6ukGuP2RwaX7x4/Mv+9On20bS7YMg=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=lPoFKg/LloKksbiYO1aeKihATw8dIOoP3mMTr98RaTv5k3Bqkkre2nuRxHseYGFgNJ UCjTpqTw5sBHB/NWK9MsXYauZR/e+spQckFoHN3xqa+ptwljG9Ows84Z23E8//mafY3l 6XabL3/2z3tJn73wo1f/a8PPl3ywi9MjyRB/53fOoZ3Fb55nM5JturmXQDfBevcax+B9 lG8ZQ8rhbWp27xbOPfx4BFYQjBg40JLi7tUaOQzXQUT+OAPHTjzkP8aTXq7O/mfWti8M XV+5si/SszRAzK6O44vOOykKmOc8piXy0ZYXnkqlB5AG2b19LMP4697dct6OUcvtDkxd nf/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GxV6WBDn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id u1-20020a6540c1000000b005b882238681si3404753pgp.620.2023.12.01.05.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 05:53:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GxV6WBDn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 57826817C8BD; Fri, 1 Dec 2023 05:53:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379076AbjLANxd (ORCPT + 99 others); Fri, 1 Dec 2023 08:53:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379055AbjLANxb (ORCPT ); Fri, 1 Dec 2023 08:53:31 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 461AF1704 for ; Fri, 1 Dec 2023 05:53:37 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-50bc811d12fso2949314e87.1 for ; Fri, 01 Dec 2023 05:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701438815; x=1702043615; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=P7K5IV7jdfgIwO6ukGuP2RwaX7x4/Mv+9On20bS7YMg=; b=GxV6WBDnZPscq5Pu26Z5Cl4jQHZdAitXwQa6wslIUbNMO1dWf6T3elmYL+A9CPSCu6 6npNL4JPtsgmtg57pZ/ZVDlHadHbW5YNSjd8a517yv07edJp9lHmFZ9atH/Fm13gYiay GmOo2qJ3AGFQPqp7zny20tYAeEXefJy29/qubLGk/DduszDOMhYiBh7wC1CSRaTb5g82 1xWOxr+OLcDljho749YgIf9TXpFA5K/oJf4iQxYgydwbeL+yA9rbg6MPjbVrmJ2Dsh6z YhLY7PxFdDeoyceekGNXQDBxcYnQIXgdH6MZosskiB8h8whPqpNdwYPWmpaQDDsIFqEw u97g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701438815; x=1702043615; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P7K5IV7jdfgIwO6ukGuP2RwaX7x4/Mv+9On20bS7YMg=; b=otOurpj8/zCeTS+p0GA4TbbKNcixZIVJ8sz6RGBvxQYSw3Kj8c8ElBSmASM+1K9sv5 2Sx8TL/M40LefGx9ApYi+NT2VbI/bLohsdRF3fRWNXq9AnfPjUBx0DHJpSvsOmFEx8sF uyiGj1v1n/910RBrKLInHs1Z0JiSpSv/jo98JIgPAFveugg1upd1nVYzNZSyyrzej19k 8gX5ictEN/HOYKlSUmkcW4alNsiSsHq5oprv6W9Ex8b3jIAE7k67iTGD3jHpf4v/FOQS NGvjlqrwqeF6xSgB3GZmfgNlbIn0d3S0oaeusuCIwGrXeE84GEICY92rfDG42rLfRb4s YERA== X-Gm-Message-State: AOJu0Yy/0to1WqMDeX7g3VBfx+0SKYxQ8CmtAGLD/gsBm/5GXIldZBQM jBeQtZHJq1qCKUzgiGqLbWaYuj1cw0cMaYzYZWQ= X-Received: by 2002:a05:6512:48ce:b0:50b:d944:c049 with SMTP id er14-20020a05651248ce00b0050bd944c049mr357349lfb.267.1701438815464; Fri, 01 Dec 2023 05:53:35 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id d20-20020a056402001400b0054b531907f8sm1643159edu.73.2023.12.01.05.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 05:53:35 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] ASoC: qcom: sc8280xp: set card driver name from match data Date: Fri, 1 Dec 2023 14:53:31 +0100 Message-Id: <20231201135332.154017-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 01 Dec 2023 05:53:43 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784087920989216270 X-GMAIL-MSGID: 1784087920989216270 Sound machine drivers for all newer Qualcomm SoC platforms are the exactly same, therefore it makes sense to use same machine driver for newer platforms as well. Choice of sound topology and user-space Alsa UCM files depends however on card driver name, which must be customized per each board. Allow such customization by using driver match data as sound card driver name. Signed-off-by: Krzysztof Kozlowski --- sound/soc/qcom/sc8280xp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index d93b18f07be5..7df28ecefd65 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -14,8 +14,6 @@ #include "common.h" #include "sdw.h" -#define DRIVER_NAME "sc8280xp" - struct sc8280xp_snd_data { bool stream_prepared[AFE_PORT_MAX]; struct snd_soc_card *card; @@ -133,13 +131,13 @@ static int sc8280xp_platform_probe(struct platform_device *pdev) if (ret) return ret; - card->driver_name = DRIVER_NAME; + card->driver_name = of_device_get_match_data(dev); sc8280xp_add_be_ops(card); return devm_snd_soc_register_card(dev, card); } static const struct of_device_id snd_sc8280xp_dt_match[] = { - {.compatible = "qcom,sc8280xp-sndcard",}, + {.compatible = "qcom,sc8280xp-sndcard", "sc8280xp"}, {} }; From patchwork Fri Dec 1 13:53:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 172496 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1133203vqy; Fri, 1 Dec 2023 05:53:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IESAbtknbAnrJa1CWjUHFb4/Pwb+RFvgEAY/t/RERM54bLo4Nv+8p63UiY6/55F+4TcxzJX X-Received: by 2002:a05:6820:626:b0:58d:ac91:1dd0 with SMTP id e38-20020a056820062600b0058dac911dd0mr3519841oow.9.1701438837748; Fri, 01 Dec 2023 05:53:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701438837; cv=none; d=google.com; s=arc-20160816; b=yUUI3yGBoQyu/1lJMus190ZQu7HGPKEbtTlrQZdyvZfwAGF8PGTFmYGLXY3OSfFOa+ z9d/P9mn+fB92vhRuTIdljrPz745exuHodJNbA1bvIm0tAvSJc740LCrqTTLLmlsXxLc 8cY1GPHIFO48PGX4GcNdMRckdVA0IX0aRIGdK+z4Adxz73tYllJ1Wqbj2mhMqY8UBZou yrGEeF7yzY1IP2A0w+XwReRM7rfP9oV5Xm/k+bK6jLAOpkLhhEUFUJPNfxsFUuuOjFae FzZ0yeQGSr6OOpsL2iOEudugnRAY9RZW2K7JanQIRjMixVxqyXYFHR523niGMR2D7W4n AXww== 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=0XO1jfSNAX5UUapl1o0DoRwp6Muw1NAKcPjYnOb3wSQ=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=e6Xzd8EkKkpB6RYqK4mnQT6/NWKJyAFNd7aeJJEt+EZMheKyBsMI3cwAy6vzWR+Jl9 m6aafYDFaFCZff+E2oz9b5TcrRg1TcQz7+ly1fEvbvxIwKAH97FbF4FM/+WEWvm8y6uI hnCT3PBqWpOYBQdeTEI9xwRNymo92kmO4DhoBZXfPpE/Mxtg/t3y2+y9T50ucW/JEBmD QfKYCDKIdy6xb+Bl+OyZLED4GHUZM+gQ9X1nPmm6UWpB4COVGnmpPVgJlo7Up/c/NkE2 LKGtAw3nWCl72YzIqvgaJ4BS84WXgvBIMTH79g1Y/54QoEjy/8wX8PH64yAlEfguuLgj bRtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kVc3BHY6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id z8-20020a4a8708000000b0057bad4e56e1si1223716ooh.48.2023.12.01.05.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 05:53:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kVc3BHY6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 682FC83AE41B; Fri, 1 Dec 2023 05:53:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379082AbjLANxe (ORCPT + 99 others); Fri, 1 Dec 2023 08:53:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379060AbjLANxc (ORCPT ); Fri, 1 Dec 2023 08:53:32 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42478170F for ; Fri, 1 Dec 2023 05:53:38 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-54c1cd8d239so1976583a12.0 for ; Fri, 01 Dec 2023 05:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701438817; x=1702043617; darn=vger.kernel.org; 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=0XO1jfSNAX5UUapl1o0DoRwp6Muw1NAKcPjYnOb3wSQ=; b=kVc3BHY6ms+vr7mCEQhUipVj6lSVOqPo9jLWvxYAuvO8C1gVMG/80/+N27hEVVrxIA h8BmlrCeJZtS8jo28/0BE/4dht1RgPizeFEYE1lOuGnxT8+XOAuQdGf+7Ggf8Rw8ODvB GgdaLWX1xM8MVryLNF6Tg76iiDUr/twUugpVKm5iOp5h4oNOclJxJW1/1YLCr88srRgc f6GH18qhjRrzeZ456y2qzFjG7On/G3MmXe3aW4ukK3hnMVzKMcqmj9zMQkBGdpqdByxS 03z8OwV69sAoiN6L6qPmTM8lRg0BVy3sYffbVRocc/IJ87y6+6nbpYouywERIJ9qkOjT Ccow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701438817; x=1702043617; 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=0XO1jfSNAX5UUapl1o0DoRwp6Muw1NAKcPjYnOb3wSQ=; b=qPt1CYZ7X5MSni0bzXvHE+RHFaSft+WRHE6EqE2B2D6qG0yhSOHcdq/iBbfQIiuHu+ 8o6rYK1G247WpSp8wBQV7qXSaLeWrzeFTgBhfS374izAjYiBZ1bKCD7HvcAz/dVrF/K9 yloWVOw2wYiBGjzdAHlVwVJ1OKgDUh+qADjp6sBnnHv++ydugdzMMmDUbrL7QOfIIgZ8 tE1Iz3Oyn/72jjsj/8l2NXBqYR1+9G4LyLpasdS/Oe6GZmlbXTeqQ51X416ZdRcq+xiX gW+vcknLrt+2DnjPX9MZcc/WElWZVe1iDiwbVoUof6yp2acrbDnU5+c+Pd9ilDXfF5LM m3/Q== X-Gm-Message-State: AOJu0YyFAM4RShcnKuHY5NcIiiFkA6gMuT8L4Ti4d30Y5xHJ9d+u4FjM xbzyPuJPrhqSyF1Le48hzsXUhg== X-Received: by 2002:a50:d651:0:b0:54c:4fec:f1 with SMTP id c17-20020a50d651000000b0054c4fec00f1mr361610edj.128.1701438816710; Fri, 01 Dec 2023 05:53:36 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id d20-20020a056402001400b0054b531907f8sm1643159edu.73.2023.12.01.05.53.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 05:53:36 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Add support for SM8450 and SM8550 Date: Fri, 1 Dec 2023 14:53:32 +0100 Message-Id: <20231201135332.154017-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231201135332.154017-1-krzysztof.kozlowski@linaro.org> References: <20231201135332.154017-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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 howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 01 Dec 2023 05:53:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784087930707188224 X-GMAIL-MSGID: 1784087930707188224 Add compatibles for sound card on Qualcomm SM8450 and SM8550 boards. The compatibles were already documented. Signed-off-by: Krzysztof Kozlowski --- sound/soc/qcom/sc8280xp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index 7df28ecefd65..837356ac541f 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -138,6 +138,8 @@ static int sc8280xp_platform_probe(struct platform_device *pdev) static const struct of_device_id snd_sc8280xp_dt_match[] = { {.compatible = "qcom,sc8280xp-sndcard", "sc8280xp"}, + {.compatible = "qcom,sm8450-sndcard", "sm8450"}, + {.compatible = "qcom,sm8550-sndcard", "sm8550"}, {} };