From patchwork Wed May 7 08:01:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 888225 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.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 73DBC227B88 for ; Wed, 7 May 2025 08:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604934; cv=none; b=EYDtdvTgweRPp5CzOe93LPsx8T3rMhXyqVOG71754IdxcqvP+rZe43IkNdPgEi1nTnFFDL4w8dRQrK7ngzAsrFAehyV2+mDunuN/exmGOoxG5GAmygtT9YaTwwxYZ+aHX3k4pt46dM0Chi2NDQh4rk94QUr/eTdv0TKhJqd7fek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604934; c=relaxed/simple; bh=9du/cqVmLABi3S4H7ZzYui0a7J0RxPnHiR8v0eg+GN0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dvwjQotiA3U5FUGdpVAM3aA8O8N4+zuOYPt4NAgz0r/gZe/7hbnRct2cg7Ph+1MQaOokQ9r2YANrlfGZDTZh7OkL4FCwhAdbCfNIXsbda73Zw9UkaOCgAJOPJonzcvX1v3IzolbO/eznhX45U9yjknHWTJ5GZBK7N5t+d2CMp5w= 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=aH27DY0v; arc=none smtp.client-ip=209.85.218.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="aH27DY0v" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-ace98258d4dso974108066b.2 for ; Wed, 07 May 2025 01:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1746604929; x=1747209729; 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=aH27DY0voTohBr8HRChz6S0/3+fyIkQNuErhKJqhM3NksMajkZlNOGHF37fKoce01q kfriDLkgQODwg1mMWqo5eK8LbdLAt+Olk6e8kOwX2xUdWf6Y1qW0SWgbvHCg409tYSxX 0VUs2E+y8K4nwDHbyuYlnyM0utpsW44jWenAR4HkLc4FSbbr+4+BEukuvprHywOJ0Snk lsPssuBeUkPACY3HsjPPUH1YmeFKQAkG2Jgr5l6Hgtl7khiTi63b2rGMRIkg8GEFhSNA /A25oLwoGcx5X6UK35DzQV5tP/1cKxMvC8L4EQRzROFV8y7iFDOfgH40qL22jwNCeVw+ kkLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746604929; x=1747209729; 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=M7xH9ogKKo/L50qiWbqr+5Gzqpd7gRFY+xdTIHV5NoIfabzxu1vUIBYdzxCSXlwPK5 fRPcYILOynAwT/KUBBg6JuNBdCq0J5ltCMWbqFFECueMgMg76ZwoHnyWCU+tg8zk810v Im/l238xYJzpaqerMciNXFQ5YFJh3NanTpFkfxps5xdl8XjQMQrm7sIynCjpFKndj+td a4X00V6dYk9yTZQJ0i4ZCxZsLQyswrcEFTN49YeTxfWFWTV8EEPDsHaC2kVs2QJWTQ5J CA28/d3Y+nB6aRqTatQMUoWFpmcZmyro6IUpzM4AAB7E7NmooJs6y1CquU6g/1dr9bql 24AQ== X-Forwarded-Encrypted: i=1; AJvYcCVyUpGSsoFJRhZ2e8kTokeMN1x490PKUVaqHFkTNB7Ht0zmSa96Xz2M1UNogj/jlhrHYHMkdx/KQsxjauR1@vger.kernel.org X-Gm-Message-State: AOJu0YxBlkpLmDNh/bufh7mjPEcgK7XkxQUpBcT2UYTa30+EzNOu1dZ/ BdbccXj7wTyzrC2Kq7a9zRsfig7o5wtqUB20M/uJ1seavfINY++V6EKG2C+zXew= X-Gm-Gg: ASbGncsp277crIENDLWEqPe7QogmMy8zkLhJgxAQ8xedRqWsbBLUyioWfvMcSDYLl3n Cv7DQL7dW2nCVYRaOiaV5Dp9bGtga9QcnHmS9Ay+ycPHYhQyNROU+9ASCeWeHactso9I6LjXu3A oR680l6Dty2DRv2in6GhIbRwx2hJ6TLg0J1eNTVjcnbIuJRbkoOuKa0yAai4JTdrk6xeV4LqM5T k7SIqUzx53zi7KwvENVLvkyWlQRDNDmuUTdlKGuscN3QjSKBYtEKft5e/qYyuKn4Wg2DJnnaId1 YdFzGbeHC1P+fA1AjZSLEJ2ZlooaQjSe3WWnrSWoa4t3C8l+VEgRfngdc/haG4E1XPV5dK1R/yR NVJ3VfzLrhsCplA== X-Google-Smtp-Source: AGHT+IHag0H2cbbPyO4b5Fnqc17Ebpqc1RQXUqG6LtKmBXIShvnF4nzFMo2lTa0qFSCUZEOEH+300A== X-Received: by 2002:a17:907:d48f:b0:ad1:e7ed:c1c5 with SMTP id a640c23a62f3a-ad1e8d5f6c8mr200591666b.59.1746604929014; Wed, 07 May 2025 01:02:09 -0700 (PDT) Received: from [100.64.0.4] (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad1894c0310sm855236066b.88.2025.05.07.01.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 01:02:08 -0700 (PDT) From: Luca Weiss Date: Wed, 07 May 2025 10:01:41 +0200 Subject: [PATCH v4 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: <20250507-fp5-dp-sound-v4-5-4098e918a29e@fairphone.com> References: <20250507-fp5-dp-sound-v4-0-4098e918a29e@fairphone.com> In-Reply-To: <20250507-fp5-dp-sound-v4-0-4098e918a29e@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";