From patchwork Fri Apr 25 08:07:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 884906 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83A5E233136 for ; Fri, 25 Apr 2025 08:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568456; cv=none; b=NCS2d9EeJBv9RGhRBXqxGfArCR6Oj6/ul5x3VsU7KFMRK0P0rFrG4JyRadTdw5ms2gWpRrCB3lzKy9kApRDvXcQ7d9XqsuIC/AjCU5m7isuNEVWJgzlDJ4TdKIKBNIoPW68cAoopwJOP9DIPu/qTTkDnlzWlTQZVE240EMwZjtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568456; c=relaxed/simple; bh=4r9tJ+EcKTSeTDqTruse8d4E3SvZHkJ5ztPCJLWlUSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vol2lWwXz4nTAIylDEAxI2ibx69hwNUyrcpkD9hs4oE6OnQDmXEDsX1ExC4uClVFxut5aPIAeT7Vod4f1/imVRQBRo2aGym70Qpn01hICwu8DhZmzsgNYvhg5KLYmUB/bmfOgggSkBH2XaOs3BBoXM/uGiC/QVHmUTIlDdt27cM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=hAmJjKIo; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="hAmJjKIo" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-39c1ef4acf2so1478144f8f.0 for ; Fri, 25 Apr 2025 01:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1745568453; x=1746173253; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=q+B51z9x2y4YummWOIXlfsBUwS8WF++0rEKHeNnV0Us=; b=hAmJjKIo6hrty6Ia4dd+Hx12AtnoAWlBrMlJN4qqI/6fFypkKSN2pfcNP1xOumrSaO CLnQQKr6hZcPLEvbGtjTFrqKmVmDq7Xo8Cv+VOkyeV21csFzxu8BiH/ug0r7+TO2Qcyc DFKR6fUnVKKubyYnpB8nd21I9/sjdYRacLhulEOXlmZJ0pdeLcyFAAwm9iL6l8CWPRH7 F85qFr1U44FNEJSlnatmW/1EN9ZWij1j+fjCvgXc5YnFZPku2wumRbKPV5htn2aBke9E Gg1wIEYj34s6jsQPwFy2gi++Zx/Yr7bjPvJZk5oe7NjrsOF/02lpbXZ2V6GukGC2m/Ps lSrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745568453; x=1746173253; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q+B51z9x2y4YummWOIXlfsBUwS8WF++0rEKHeNnV0Us=; b=QTVNjAmQnnAPrfZ7R4I0JRJt/KSRWFXQBlmlOd0uUsUgPYg+JKMN1xa46CZY9Dppnm rupV4khoR1UBZ8EEK21Mx2JSQ1blrEKdMFtMHyvkbWsmYOXTT0pIp5qDruKlxAXb/Zuu wuYUNgR4KxkRM4vQYtVqLbcaLWMzAat3IUGnYlL4Vj+/2KLC4rtpG8Px3Qcd0iCkz6u6 lY51KRfkcgbV+kyPmZdGh1930aBZYfVsqP9VZiMGAzMY5WoBO8twaqWIzdOapjGmwyOv HXR/YV4mWoUsXkS4CR1VEwfjoDQ/7X+HFPhf6NDuKLOg+2lE/KNTYdDW0gRa7BnOTeUd ZOag== X-Forwarded-Encrypted: i=1; AJvYcCXYWa5b7QuEN1ugiUHKUlu8cQCmkMhbahji8y3ZjW28TTB9z6n8vrli9rZ93W+XaNPOxCvOprM4SRRPFsFs@vger.kernel.org X-Gm-Message-State: AOJu0Yyt0tzxwunFNZ451POCc/HgrpNI11zhoQdOVElD4C9XEdfg2tHU FMrQMxzUP3elSs2Q150ppvzWysslihS42voKoQEYmFql7lqb2b7tYOf9AaQ2UsY= X-Gm-Gg: ASbGnctAanDZVCOBVRDkp5GNd41Ok2n8A0KPg8EYwaLfb1BtQ5Mx8b1tTTOddODD+D3 tN3WVOiXvIjyrXAAgf7+o5KC7+2qice2c8A9RwQ5o7uEfdK3hX22kvMATwloMoQfdZdvDZ9ifeW UkCXoe4TagjCtLBK0hL3EqStsem4REtMSq+wRasEm4et2fJ+R/pyxFqvmCQiGJR/O3s4PLVrj1r kfl2dTfFviBQvzu4B45gTjy8HjMfqgCTQPruqIHr7EpLtfAJkI+xJiqAI4x9UCk06T7c00FL8km xmZqNKdTbueGpdAj2gwBXuFrI61lQdC4wwvNPtJ+ZZkF8D0ZOWrJ6xoqWCVzrKX5csiexjcUBth MAGzmpbZoDlW0LJHUynAPfI/phCJoovlovFJBYUDZxsBRYH2IUeOy2xXK X-Google-Smtp-Source: AGHT+IESPkwoSXL9H158Zipa+9IfMAIxHeKuyCQjlKcULNXaCkr05UQj4rmsW9F9V/zyF5XpgSj7jg== X-Received: by 2002:a05:6000:2485:b0:39e:e588:672a with SMTP id ffacd0b85a97d-3a074e0f0c0mr971220f8f.7.1745568452582; Fri, 25 Apr 2025 01:07:32 -0700 (PDT) Received: from [100.64.0.4] (2a02-8388-6584-6400-d322-7350-96d2-429d.cable.dynamic.v6.surfer.at. [2a02:8388:6584:6400:d322:7350:96d2:429d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e461casm1593513f8f.74.2025.04.25.01.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 01:07:32 -0700 (PDT) From: Luca Weiss Date: Fri, 25 Apr 2025 10:07:25 +0200 Subject: [PATCH v3 1/5] ASoC: dt-bindings: qcom,sm8250: Add Fairphone 5 sound card Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-fp5-dp-sound-v3-1-7cb45180091b@fairphone.com> References: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> In-Reply-To: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 Document the bindings for the sound card on Fairphone 5 which uses the older non-audioreach audio architecture. Acked-by: Rob Herring (Arm) Signed-off-by: Luca Weiss --- Documentation/devicetree/bindings/sound/qcom,sm8250.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml index 4e208cb7f6c61adfd4b687227038d275f849480a..57f62a228c262f38e703816efdcf443355052619 100644 --- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml @@ -28,6 +28,7 @@ properties: - qcom,sm8750-sndcard - const: qcom,sm8450-sndcard - enum: + - fairphone,fp5-sndcard - qcom,apq8096-sndcard - qcom,qcm6490-idp-sndcard - qcom,qcs6490-rb3gen2-sndcard From patchwork Fri Apr 25 08:07:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 884604 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71876233712 for ; Fri, 25 Apr 2025 08:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568457; cv=none; b=KNWbmSQLwmx73Pp0Oa9kLNxNZrTNNhDpppBrxhUjI+s/8IEri1fGJXnNK704Iqva9JVkJwD2h/f7r2lIOmhtrXYYyJwfrb9IiJAcQbXwYhupXebId96tKxk5IJLd19c7aWT82AhzNd15a9Kd59xmD5Hq8StA3tm1K1zq118utnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568457; c=relaxed/simple; bh=t2UqwPYP1B9XN/iC4TKLlBIAancDyLL4wrE626PGHow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pq0/XSHJStfESb+rw8te00Gt70DEcdZR78dALvvDcSlb6kEijFRvvQa7XKokVBehnAjTnmRtHH5tM2TkmSLsr/2RRd5/4vX+yDpu8JWaVgIYXQxX0f3wGJtQomdQtsmnFLVEhNB2kxFAFB7sY3GxJ5RrQh+ixPESISEE1WYgxzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=E/ZeNWO4; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="E/ZeNWO4" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43cf848528aso13496165e9.2 for ; Fri, 25 Apr 2025 01:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1745568454; x=1746173254; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mF78VVS1a3vgPm4/yr7suBZclt6DuZ16jbZS8capHhc=; b=E/ZeNWO4NOjvxBEyxrMqorhodK7sD0OA8gGwrzWhSZm+/Eruria3SxiWJoJC1dI8lk 0qe2/F8iWfyDpJqHMckbEZtd510KWYkbyUhUbS3156V4Z2ZPTyV5OUtcUsVArq731Dkh +3fohrEDKlc6iTjK7AsMHPVAi44VjDgPIFQ+bCcGCbtCGlrJz9dgurhjAGYHt2UYTfvM VnBcMp52NSfSs4ffnjBfE6n7DFJ5Pf820fh1f5O8G46UBDBqRXl/3AbCqYVjwkZNOqWM xFLWhIfGezYoRtQjZi0tbRPWK8MaGYVIVoLESQxGqkMa+ViFlwhYGSiaZA+FAv6EPLYN FwQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745568454; x=1746173254; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mF78VVS1a3vgPm4/yr7suBZclt6DuZ16jbZS8capHhc=; b=JKdpJUetiHohEMcKIhpphGFIxF0pSM/s09TLRm5B0Fh1KcAMi2IcTyR0AdgNOFuO4I e6c/hP3yiuya++p4BHhihEFyJHaxaJpMvlYNnC2Q3h4xJ/6u1g7BRzTtnGzoMLv3dUS2 5TCGsix//ckrZlAoZPoWD+SestFfksrcco6MLwl+o6/MeOVEj02dyHkenQ/cM46vQMn+ 0pY0R9NcYNP5ztNQjrhpD49EUgSNPth2+Jj7cvIw8Wk5hlONd85T5S0Qes1Be0SnTtMk kDRgj9OBZE01ybGyx7T2JfhzTXAIny8oIHvRbUKOlhzp+64OgYZ+OaoZokzK2IC/E368 ypqw== X-Forwarded-Encrypted: i=1; AJvYcCUNdgNmQgHVBGjE8vxK735DHFuHwIRl6fyNCbNuIjgDuN8DmwN2XuX7TxAJX1LAOcDJ/LvdkSjzkYpblP7T@vger.kernel.org X-Gm-Message-State: AOJu0YxKrQG3Hy05Sz7jf1EcmhnBTDZCPWzVFHD4P/ul/8UxsRPcqJVD O/VqsBL/0iRDqR+4aSIIg/EA0zRz9HhxeQqz4q+JH94zapTEb19vXOutL5fHwcc= X-Gm-Gg: ASbGnct2C8t/d+plIccW+9Jss/DuuRhEBujyjDOkZejjWit8x/KVFbYOqI2z9YhcMNA WFuEJ/+LtQ66DeKOLy5u0J4gYn3ax2uCkD36FgDZVgpeNdEqMscZWbDhQEE/pTdRxl55mO7A3Bm Hm7AZieuzO3HRis651fCj7nsrNRJ+tWekiU7KHipMfrNouFHimhkBZThN8Jvdt/Islb07dQgweb 4fRRIpTPE2bP9E+cri95bRfeGCmUlqL7S8v7NZq0e5MWslUi571815JthTA5uglb/jjPKKqMY+i RuQmZcFQAzkborJkTM4nejzHWZZ5qGQqTpEDXsJvEy09C7Nqr8fV1BUcuOokIrX0pf6CsmjtveN SUHDJrEpW3XXKswry36uI7fipJkxyGaqbpAtMURMqXv74DfH396aUN4rI X-Google-Smtp-Source: AGHT+IFVDfaMfuOXmMfOCltuXID8xfqxstRaUVHZiIEzVJ71LDPZOd47+6G3giv9YW3kXwRnEPBUTA== X-Received: by 2002:a05:6000:1848:b0:39c:30c9:815 with SMTP id ffacd0b85a97d-3a074e1e7b5mr964843f8f.21.1745568453788; Fri, 25 Apr 2025 01:07:33 -0700 (PDT) Received: from [100.64.0.4] (2a02-8388-6584-6400-d322-7350-96d2-429d.cable.dynamic.v6.surfer.at. [2a02:8388:6584:6400:d322:7350:96d2:429d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e461casm1593513f8f.74.2025.04.25.01.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 01:07:33 -0700 (PDT) From: Luca Weiss Date: Fri, 25 Apr 2025 10:07:26 +0200 Subject: [PATCH v3 2/5] ASoC: qcom: sm8250: set card driver name from match data Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-fp5-dp-sound-v3-2-7cb45180091b@fairphone.com> References: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> In-Reply-To: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss , Dmitry Baryshkov , Neil Armstrong X-Mailer: b4 0.14.2 Sound machine drivers for Qualcomm SoCs can be reused across multiple SoCs. But user space ALSA UCM files depend on the card driver name which should be set per board/SoC. Allow such customization by using driver match data as sound card driver name. Also while we're already touching these lines, sort the compatibles alphabetically. Reviewed-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Luca Weiss --- sound/soc/qcom/sm8250.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index b70b2a5031dfbf69024666f8a1049c263efcde0a..e920b413b762c803cfcc4049f35deba828275478 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -16,7 +16,6 @@ #include "usb_offload_utils.h" #include "sdw.h" -#define DRIVER_NAME "sm8250" #define MI2S_BCLK_RATE 1536000 struct sm8250_snd_data { @@ -200,15 +199,15 @@ static int sm8250_platform_probe(struct platform_device *pdev) if (ret) return ret; - card->driver_name = DRIVER_NAME; + card->driver_name = of_device_get_match_data(dev); sm8250_add_be_ops(card); return devm_snd_soc_register_card(dev, card); } static const struct of_device_id snd_sm8250_dt_match[] = { - {.compatible = "qcom,sm8250-sndcard"}, - {.compatible = "qcom,qrb4210-rb2-sndcard"}, - {.compatible = "qcom,qrb5165-rb5-sndcard"}, + { .compatible = "qcom,qrb4210-rb2-sndcard", .data = "sm8250" }, + { .compatible = "qcom,qrb5165-rb5-sndcard", .data = "sm8250" }, + { .compatible = "qcom,sm8250-sndcard", .data = "sm8250" }, {} }; From patchwork Fri Apr 25 08:07:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 884905 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AE2E23373D for ; Fri, 25 Apr 2025 08:07:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568458; cv=none; b=Sl1THJojYeB9Aum6KSk6Zqb6w312mV8Zzws2Wz34CP5Yo5iMETL5UmzgmE5ZgkXeyWR3jS41k6fEOINJ+EmUoS/v9fq6kZ51jh9uuzqtMhc0kOTm0XCA2B1OfesJ4NryTeYWN8KlpWhS3wzqvJZQRW9Tr+G9HDlE2WAcuEfEBMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568458; c=relaxed/simple; bh=0Tu7c/55MLpVHgNQHr6rjQgjyskQ0bSBrdifeMj848A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GFMlkBa/mM44amLL2lslkP9lFEiB9Dhg5M6NMIcvd8C1rXDBZF+C2tXlCoYtEW8zUJZe1dCdzF/nz066RCM5xfgN86MYzrsxQNinFJxdMlTZozlnpQi++UbtEPfGDk58EAvVVKscJDJoIwBQcDWLEc46bCYg6cl2qRHOsXWwfXU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=3r4Iwxtv; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="3r4Iwxtv" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-39ee5ac4321so1979439f8f.1 for ; Fri, 25 Apr 2025 01:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1745568455; x=1746173255; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=E/5LsCgffLwJC40iP8PJSPd6pyxub1HE/XdBIbu8y+o=; b=3r4IwxtvoEAls5z8rgeT4GYq9RM+ebzqM9NWWv55SkxOgf/eAMA/oUFh3CogGAyxOJ qaQ6BpAN4/PULiSNNS8cY7ttpkqFh1KROe2m8Txd/KJKylJd8Ysq1iYljOOBM2pTnQQI jzddHh8t1K/y7OR29iVGSV1FnjAYNS9HTJ/sg6aw/cyJ8/DkGRS+ayANKllXWQY0VXF0 MEEhSywxxyKyD1fvYUf6vqe9uOT/Rfz8Q7f6HxypG3NyyFegpvyYoUz9fKS15Yt/Ma0K DzvmCYMUbCO87Uf8UBIwFVUkvRHF9lxTnKQ3yjq3aHklywOLw/oC5e60mjXsYXfJNKJN VdHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745568455; x=1746173255; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E/5LsCgffLwJC40iP8PJSPd6pyxub1HE/XdBIbu8y+o=; b=jDEPgzlYNj9/nH347NchRiplT5CIGmBu3ORS1Ew8R4Youmh/heKqVn2ZZCL1OjHOnG 6PQEQG0MWHMyCAsgpWDrOKr3yDckXYSaaXLosXg5NdgwdFd+NRD53qcotRqy6MSkp1KS qf7W7AEJWObfjPW+OOoqag49naxjUvjS4vcz5GROsZpei8h2GkQLJ5t2N0mJEq+uiNA1 lKlsoIHzEwhjeJlsu8HJFVkCVWvj6qCzIINZDYlgbkaUaiR4gjpGg4oPzACUhBf/0/ch xwHyzPydfe7yP2NTVCtmIfp8Oi7IogPQgx3wG2Hv6uYFQKvcU9ceuN0yRlZFFauoRUx4 7Kiw== X-Forwarded-Encrypted: i=1; AJvYcCWhvfZZsVN7XRSwp8tCq9knxXxbh5NK3xyOxWiPukmDLMnRSkqkmjzZHDUGu4akLtV3QrImqd6JBLOkRZ1f@vger.kernel.org X-Gm-Message-State: AOJu0Yzz5/91gg/0/CnoqsKTY/2mDWorm4EvotkqjgQcQ0EYa+vJSrkq /jJX5ZC+Ly3xDDZ3qTNawXjIl3OW+WoTw8DhNNd7qMSoYRHowWVX0hRurn9MP90= X-Gm-Gg: ASbGncuGOo4QbusuGWL6TYAtVrnOsP0vCHqew1+1R8ZRFOIK8QGalpLTiYJZsX/Xwjy u8qRTnZ46q3Khp0pem2s4oHfj7GNJisVLDN1XuGBGY+INcVtZBjpQTPbCtpgIOhXBja+nrS7B43 hQi4ZZq93qFmkCl4cj8gNxfK7+t1c27UaadnkjLcydKvKt+S+/ke+BjSrwym8gGSa+3Hl4xlIHN ZlN+BdW7rOKcPoiBNPPfdw/a1vy8/vAWIRZ3vtxeiYCk4L35wklfeXFUrxKG7JcMTU6KeE0QNQI TZKvXTihbcZaBX7atMbtjm+b2HH3PmtLd+h5LPjaNYW8W/kEo+M+VhAoFTLQae6b67E/cuiwMSa VdVwx+NFrhbIcgLcbxiFAJpTer9sgI4jNjtkzdi0LWAcEKd059yx0i4J0 X-Google-Smtp-Source: AGHT+IGnsZ1b2dFNba8xAUTuBj3bQrZzqkheFyeShJZeV/m9/iuVWWISzbszqwiJOzfRZPRZ+u6F+w== X-Received: by 2002:a5d:5983:0:b0:39e:cbef:c071 with SMTP id ffacd0b85a97d-3a074e2f521mr936972f8f.22.1745568454883; Fri, 25 Apr 2025 01:07:34 -0700 (PDT) Received: from [100.64.0.4] (2a02-8388-6584-6400-d322-7350-96d2-429d.cable.dynamic.v6.surfer.at. [2a02:8388:6584:6400:d322:7350:96d2:429d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e461casm1593513f8f.74.2025.04.25.01.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 01:07:34 -0700 (PDT) From: Luca Weiss Date: Fri, 25 Apr 2025 10:07:27 +0200 Subject: [PATCH v3 3/5] ASoC: qcom: sm8250: add DisplayPort Jack support Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-fp5-dp-sound-v3-3-7cb45180091b@fairphone.com> References: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> In-Reply-To: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 Add support for DisplayPort Jack events, so that user space can configure the audio routing correctly. Signed-off-by: Luca Weiss --- sound/soc/qcom/sm8250.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index e920b413b762c803cfcc4049f35deba828275478..a4bf6eff811ea3e2b005071cf3410e5a0410f5d8 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -25,6 +25,7 @@ struct sm8250_snd_data { struct snd_soc_jack jack; struct snd_soc_jack usb_offload_jack; bool usb_offload_jack_setup; + struct snd_soc_jack dp_jack; bool jack_setup; }; @@ -32,14 +33,16 @@ static int sm8250_snd_init(struct snd_soc_pcm_runtime *rtd) { struct sm8250_snd_data *data = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); - int ret; - if (cpu_dai->id == USB_RX) - ret = qcom_snd_usb_offload_jack_setup(rtd, &data->usb_offload_jack, - &data->usb_offload_jack_setup); - else - ret = qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); - return ret; + switch (cpu_dai->id) { + case DISPLAY_PORT_RX: + return qcom_snd_dp_jack_setup(rtd, &data->dp_jack, 0); + case USB_RX: + return qcom_snd_usb_offload_jack_setup(rtd, &data->usb_offload_jack, + &data->usb_offload_jack_setup); + default: + return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); + } } static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd) From patchwork Fri Apr 25 08:07:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 884603 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5E5B234987 for ; Fri, 25 Apr 2025 08:07:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568460; cv=none; b=p4q2B3KTWw2u49jV0BWY1nEIGoMu265q/hKfDYz7pXQY9qqs7T0xxsO5Nm7vnK1gJ7h4br+el/RTWruiQ/Ckr5BzM/xD5IgQI1i1rEo+lqC1YMAF6BWSDtUEaP2DNVhzQqj8bwmpatj8Iyx/AncbMqWUPWb3eqnUWt6ltIUc3FU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568460; c=relaxed/simple; bh=b8O4l3RSvg0fy+NWpm7X0oPQjhPePwQH1mA0z4k72Qw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A1dqIKBxwULZdXCGT24FD+1MjNnbf4GpPoKh489tSVui4T4xtWTvsEdvNzbWiQyaBa4I9t/3uh07BWmYxNaG7vvjbxNx3nXScvNjVpvT2DUMNmreNo9jTUnBOxnEYQKzg5dfQXu3boAl6RIhR1zI9YEJG+7fmaY9I9ncsi3vi1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=cnlLabIh; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="cnlLabIh" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so18090875e9.1 for ; Fri, 25 Apr 2025 01:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1745568456; x=1746173256; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WC8RFGmD1RHEB436RAA/xlbqbziPuzDw03yfjSeC4YY=; b=cnlLabIh5/IN79utqTu4xLOQGjhG1zVzD5iUunpEnChrCkS54opeJ5MNLkc3XVogUZ wolNa2kY1IrJlamFaKgMY8/+liPY4lE0njbAqTbydpBx+YcGqEYAYRr4ov4sQAe5uy/J A1egddJMEov0RBiuCVZlsrKv3sqWU58bQIK7VA3j9ydRcifxZcnR1gUX13iR+L5j1zOG 0VWkA1fG04JwsK8djGuOODcPqHVPmVtJ9oJR7a0oAWlatplvwIF4ACCJBcFLIOqL3rnC wQ1NlA/rc/0LOjxRZvMX2muPab6xyE+5P9cjOVdSY5R2lLcvmUdd7VKTv495A9vLVNak J68w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745568456; x=1746173256; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WC8RFGmD1RHEB436RAA/xlbqbziPuzDw03yfjSeC4YY=; b=Jh9haHmZcqSa8qoZdMuuUR6fCEZkXEdYVogIaHbGJiHxzzwi/fC1IMxlFTT3peZKqo 0RMTpD4CflM8NvDZrYNzz/4kvcKUPF4KvZqOUsXdVgjqvWm13O2nUWfsCkyKRkQIv+N1 8/TmPYeXtyjYyPu2UQq66mlNyx5Ugxwu36wVZ5JsiAKT44BJ4y16UsvMWm4/4qH/UPh+ 1TZxRHsxBXascpFLehK6wL9SZlBA7GunLhgHasgAQpeeRYzEIs4RzDZAMddemx9K8mbW gZes19Ptgwn4gvxx+wsue/UUhqRhL94fIFvEsRLhtleSKsFMqmNHKp+Ms6iCjtfDNpJm UfDA== X-Forwarded-Encrypted: i=1; AJvYcCXq1lk8e4VmYbCAP14e2Pmt19CHqjFv7Diwg3GvMsqBEHz1TsUB21QZhn+WuoprV4xTEsWbGBt/auPIvKA9@vger.kernel.org X-Gm-Message-State: AOJu0YypjFBWL0XY8kIQTIBiqVD659cmFU/1Nnla3vcgQu2PlA1pJ/Tc MXG2pQe8x2fU88/rGA0LBLi12sJZoWQF191fiY1Q2i+3OXWE+yiIWia+LCWZATINZ/EHlgPY0w0 f X-Gm-Gg: ASbGnctmWNAgT9fBbmuXS1ykDZWF+iY8dvRS3wNeiVoRU//CaiWX+qPBDN8bi3jQFxH IAYh6U2SyyVPly6DDWpvYQSLc/MGriSUnor0JourVqj+BoY4JzqBwVE9HbcNKtkWZXlU6AqCUzf +bXU/r38aEs0PjJXr30LNt8uxlL932Jih/ADBg+HzhOiW1FtUC6TI0U7QPb6ywgJopuFJbfyn/X L69rYoAFyIngad7E5TuY+UyfGqC893e6rkTl5KaYNIBEtzM7KJSgYvHSANd7x4J+YM7WJjjgkP+ fvLdIwLeofOB98gdn+Eis35Jq1Tz5vUvpagVe91k/W9ILLBy81wjbHlVXR15ccaC3XyujdIzSZ5 WNH3Nq8rhMpb3EJpODqO9m7g0rZ+r4veyarB+CDgGCeQzqTtuuRS21r9i X-Google-Smtp-Source: AGHT+IHnGU5E9kdTmOEv3J8nz+wIEIG5a+AbZeoA5daYiMBxcw7FiKXP7Z+blV7YWaSaCVLY5aXfcg== X-Received: by 2002:a05:600c:4e88:b0:43d:fa:1f9a with SMTP id 5b1f17b1804b1-440a66ab7femr10627065e9.30.1745568456199; Fri, 25 Apr 2025 01:07:36 -0700 (PDT) Received: from [100.64.0.4] (2a02-8388-6584-6400-d322-7350-96d2-429d.cable.dynamic.v6.surfer.at. [2a02:8388:6584:6400:d322:7350:96d2:429d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e461casm1593513f8f.74.2025.04.25.01.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 01:07:35 -0700 (PDT) From: Luca Weiss Date: Fri, 25 Apr 2025 10:07:28 +0200 Subject: [PATCH v3 4/5] ASoC: qcom: sm8250: Add Fairphone 5 soundcard compatible Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-fp5-dp-sound-v3-4-7cb45180091b@fairphone.com> References: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> In-Reply-To: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss , Dmitry Baryshkov , Neil Armstrong X-Mailer: b4 0.14.2 Add a compatible for the QCM6490-based Fairphone 5 which can use this machine driver. As a note, QCM6490 RB3 board is using audioreach architecture while Fairphone 5 uses pre-audioreach. Reviewed-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Luca Weiss --- sound/soc/qcom/sm8250.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index a4bf6eff811ea3e2b005071cf3410e5a0410f5d8..43c93e24d77259f232062c7e4182a39151111c59 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -208,6 +208,7 @@ static int sm8250_platform_probe(struct platform_device *pdev) } static const struct of_device_id snd_sm8250_dt_match[] = { + { .compatible = "fairphone,fp5-sndcard", .data = "qcm6490" }, { .compatible = "qcom,qrb4210-rb2-sndcard", .data = "sm8250" }, { .compatible = "qcom,qrb5165-rb5-sndcard", .data = "sm8250" }, { .compatible = "qcom,sm8250-sndcard", .data = "sm8250" }, From patchwork Fri Apr 25 08:07:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 884904 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E09F2356BF for ; Fri, 25 Apr 2025 08:07:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568461; cv=none; b=QQ7wdCjUyxW7dz60xrf69JHkXbRvg1nEOqO5jTN+XKuXePhzg7Ve9/Z+xwWA2IXrSBvBgOcTtCETDc16JDgTTPvTgCCI+sPceJ4WfieoGMfvxR8CecNJqp8wLT4QiWb38v5fKLoPeKhdZwn9yhVLxCd7P1BhLMYImzeeRS1C/JI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745568461; c=relaxed/simple; bh=9du/cqVmLABi3S4H7ZzYui0a7J0RxPnHiR8v0eg+GN0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YXNE8q7NUT9YB15mf2ZA2j1R+fUy/PAUUEMOxJoJEINkJl77Ulgiqa3DM3ZclJdc/Fe5mKDOlG7pCNZ6bzO6OhYdZ53lSS/kTplK1CuZ6bFUpaIYv6JdyQ1EZGk+1Bck5qiaEDqJ38DeiOWSL4+mXc5WVULuN7YRQYYH2QsaGqY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=06u9WB11; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="06u9WB11" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43cf680d351so18058635e9.0 for ; Fri, 25 Apr 2025 01:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1745568458; x=1746173258; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1WF9R1PkrWxK/cwLXU/35vaxB2tRI8rlJl2KnNgRvug=; b=06u9WB11yeFjOEXvumQCtZa/Y7L34FubxjwlIs7sJ9qQA7jRuQGjcwFNqy3IWih0j6 NyFjgg7M6LhuhZyxB65WpfGFYwjFVg8iYv7lbyfImyn/NUjiob2KXrnRiceo7s5YOlDP YuW38CSglFy/P5j0C8r71cmN+cquvJ/t/jDXWnnZC9QhxlyHkURT6knOhC6Zr43Z8MXk i231yFBWlfikmtuWGbtPb6YknEdWO3rmTZZHjM88WHmc5RH+xOJwE5whZXvkkMjah27V JQIdSN2NTI8oxLvOpNt2Jot1IdoPfNBbuSOhxfhD+zfNRUq/dRn1VbvPTLfmV4xYu1nh qpDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745568458; x=1746173258; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1WF9R1PkrWxK/cwLXU/35vaxB2tRI8rlJl2KnNgRvug=; b=qZOOZ/zhgXaMY+GYJ8GGbhjmJIKf8PANw74WHFwz1EZbYPXy8E2IA+3onPbzFfGXTM mh+NXfP7zgcWW01ejwB8MIkTeXE4UDOFcIa3jeBAshR+rVotLJYvFA+8PSsSOEFsgTGf jR/hb9Eo96qKQnQErfwcOhwbiiyelITGgAPyq+STmxUMWZw9gyRxOekn8gCOpTeVavmK +VlaPERupyHG61ySBpYTu5X/7PcVh6gfWqO4crXBx6Zl9sTWo2mkPBSoOG4UiafgbSqi tiwmF1sxjwoosBnmkQQ2FVPMBTFPUuZgg6sr9qmrWMbSPy8gQ2g6iiTV2N4xhXY2QZev bRVw== X-Forwarded-Encrypted: i=1; AJvYcCV3iFtBI9DbgD14wXZ3fsvojpUZSYMphP3wHeRhy7cXtdmLJXbzAr6Ku1jCqhKQzZITEWyNkPJgAdo9TT3O@vger.kernel.org X-Gm-Message-State: AOJu0Yw7XJhlU405kSvPwNvCXW0KATg5jdMqgegE7MRVltzq1OraBDQT eWLiQjQkHe+0u+oGDRlmNQNK/nV1IWo3dg4jWGs/eVzdkpD2irRjduV8fbMcv/o= X-Gm-Gg: ASbGnct0wsDwmfAzN+MKNxHHoBfFKYQOc0h7mWMUB4K3qBQ2EFuyPFx3HXZvlCyed9G mgUR4VRy0PfTC/QE1NCy9hx0enGG34Yw1nJ1rs1bLXHcYvIsiRX+SgjHVFBEaOj7A5+/vpQTWpq C5gCCU8P3741NaVqF3fWjNT9Q2REkVACi4ZXLnJiMgZajOwlDxyvpUDxgzQ+RZ4HdV8TXXYZ7Ns CghegCXkMw9EIexNBZjGHq27PtKh0s70xuq7v3Aj82/3x1llzsQ3pE2qmmfUKqqv5jxZBVv9zAX FAV3lJclFHJzo85VWjOvL2tAtZHmppZ/NzfyEKgZTv9Izr6VCWKVmtyEcWbOhyAmLA6/9Ig8qZ7 buscG2q19niQVii22vpBDVPLinTk3soa8vGCACi1rqwuF7dd5gE4mqCOO X-Google-Smtp-Source: AGHT+IG/sz31Wny+TtyIaDzEEdUt0YMeO0mUdD924acJQ9OoByTsHsI0o1wsRu2TPR3UpEE0kePClQ== X-Received: by 2002:a05:600c:58d7:b0:43d:fa5f:7d04 with SMTP id 5b1f17b1804b1-4409c52a44dmr43791425e9.16.1745568457579; Fri, 25 Apr 2025 01:07:37 -0700 (PDT) Received: from [100.64.0.4] (2a02-8388-6584-6400-d322-7350-96d2-429d.cable.dynamic.v6.surfer.at. [2a02:8388:6584:6400:d322:7350:96d2:429d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e461casm1593513f8f.74.2025.04.25.01.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 01:07:37 -0700 (PDT) From: Luca Weiss Date: Fri, 25 Apr 2025 10:07:29 +0200 Subject: [PATCH v3 5/5] arm64: dts: qcom: qcm6490-fairphone-fp5: Add DisplayPort sound support Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-fp5-dp-sound-v3-5-7cb45180091b@fairphone.com> References: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> In-Reply-To: <20250425-fp5-dp-sound-v3-0-7cb45180091b@fairphone.com> To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss , Dmitry Baryshkov X-Mailer: b4 0.14.2 Add the required nodes for sound playback via a connected external display (DisplayPort over USB-C). In user space just the following route needs to be set (e.g. using ALSA UCM): amixer -c0 cset name='DISPLAY_PORT_RX Audio Mixer MultiMedia1' 1 Afterwards one can play audio on the MultiMedia1 sound device, e.g.: aplay -D plughw:0,0 test.wav Reviewed-by: Dmitry Baryshkov Signed-off-by: Luca Weiss --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 9e8f9fb57c4723a24704a8239a86c6081910916b..e115b6a52b299ef663ccfb614785f8f89091f39d 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include "sc7280.dtsi" #include "pm7250b.dtsi" #include "pm7325.dtsi" @@ -1147,6 +1149,35 @@ &sdhc_2 { status = "okay"; }; +&sound { + compatible = "fairphone,fp5-sndcard"; + model = "Fairphone 5"; + + mm1-dai-link { + link-name = "MultiMedia1"; + + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + displayport-rx-dai-link { + link-name = "DisplayPort Playback"; + + codec { + sound-dai = <&mdss_dp>; + }; + + cpu { + sound-dai = <&q6afedai DISPLAY_PORT_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + }; +}; + &spi13 { status = "okay";