From patchwork Fri Apr 18 13:13:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 14057185 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 6C768277007 for ; Fri, 18 Apr 2025 13:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982043; cv=none; b=JVKBvSiD4vaZjjxfTA6FI92wVweWHgx3xHNAcU8yE8W3VREByYz4VEhKfoTwpKiiWTZCEgfbBOdDnm0FE78vkrCiA1QZQqHChqpBNysjjGPNQjm5qaRcVBGX9r2y6BsoQ9+I09zpiMa1Cqnb5/QnnAGsYTuU6rnABvTdvZlOroY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982043; c=relaxed/simple; bh=wzHHP2feP6wHuqFLANo3CTLOjrw0/TxeFUFRj7B0ILE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YLiMZ1z3WHt6hBQBN+QOI4vygPzQ6SIelRRv8j3uQiCdfaW2ooRC3oENg8W8Ah+kXwTh0Ms/Lxj6Qn4ou6+ECM7gy3OK3Ywqewyz9vnAOLavUPaY1899/06yez/H/NCfXPlWEBVY4PePhnq6YT843X2iTGGIZlEjD9Pipnfo1wc= 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=lRXLUmeE; arc=none smtp.client-ip=209.85.208.46 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="lRXLUmeE" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e5bc066283so2892493a12.0 for ; Fri, 18 Apr 2025 06:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1744982039; x=1745586839; 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=seRyYYSYhDxZAINukYkT14l+opP0XSBbrpJYZxHqS48=; b=lRXLUmeEL5AQDEvjNFCo7nX20BT818ObDRsW7bNGHHmmn996HXjOSBgMA/gX9/4QXY ueNyKPDPQjb96TUsxT6bdpoEMWkoD4REzIe1WonQlqiiX6RbyVKaGJgaw7XGEl2EZNLV R+LvQzeUTGfXEo5xY+ehfFIshlJdnYK57PeaOH8OMRIZ8S5IsfwoXGruvPanWVZTXEkG hmEi3bdMq8tCr5A7nsHmItE4B+rQj+d/S/NmhfjvoSARqiwtMBRDihgaPPWjJYY8Z3c6 fAmwRKI5JlEM7tihczRUbWnbPufqngK85hEgSsZXl0MmTiKD12iIu8/JIfDR45q3fKXa mUvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744982039; x=1745586839; 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=seRyYYSYhDxZAINukYkT14l+opP0XSBbrpJYZxHqS48=; b=JcrOMAZlSvXpmt7TIZXdUL7L3jgQKRGrWaE+y/BKMaTAuw+H73hlgog7iHe3zqmMYO DPSwFd7+c3Z09ZFOpsX+FOOhw4UeNw/m2+mft8z7//ccjpnDuWiTm9UxMyiIepPKTMGE nAp0QW+1csRPZxAG+kn6RqSvOTZyOeNypl2Hdn3KXLclcOjkpMs4S2CHvVspJu3xzC1k NLrhBtrQSuoGf9+jNrZmacqqXOwISeNmU/sNS/TWEuzaqLOOfSzNIhnTUnswcctLTUT2 9hpKivVWLAi/yHdJstgyT7oWa5roGmb4kCN94Q7mKtCOrSJsMnAwaetLjFr/XIHBsvxp /oXw== X-Forwarded-Encrypted: i=1; AJvYcCXD7ijE/1nynYsFfbAiah6K+cXMZ/p405WEikb/1Dlu395Jq4fPkpN+B1Jwgp1W689BYTcS52n2W4i4Nw==@vger.kernel.org X-Gm-Message-State: AOJu0YybIjR+9TORHQPqUEzpMPvb5LqJeHPTZBsTeHfKz8vF4cPkAgKc bXstlYgdYV2KCjNtg2zKMT0VyeCALP76BYXL1ihgw8UsQknKbGGrCYo+YLf8Vds= X-Gm-Gg: ASbGnctAsDVOkcyb6SVwl/rH8Y8rIKOG4ja0H2JD28M3ToV+hdcJBG4WDcYJuMBWk99 wmXnB65huu7ApJcMmzoyGoVrjKKEyH884ds6XMMPWEW/nyI8SNWatRmAc2sAjihv9e4HDiQkhKG Erw9BkGel4VZu52brrb0IBjU1NRTR8KnqYh+SLIUTLN7jb64SMJ/LEv/FBxRRQUwNm5xPN1mQxL eNU018X1wsf6Wh7ialf6swI5M79iWRyHHprIlQA5xolo8ZTPUyCTDLg5Y+vUXzvdUaqH73Mq/DA Z+3i3NWa5GmDe5p2P5bnww7v58uCnhIM1wGXyioY5ujB7UVLlkQSfy7ML5Dt4EhsLFwm9cpuvGe QoKnpBosoLF2Lmg== X-Google-Smtp-Source: AGHT+IGK0w5o/tIazZ37+NXFgqNftZQkULjK7rkiUpRoTJsf3DztGjPOr0fER0jSN21I7Sk2h/cvdA== X-Received: by 2002:a17:907:7247:b0:acb:1908:6873 with SMTP id a640c23a62f3a-acb74d65b95mr270159466b.48.1744982038650; Fri, 18 Apr 2025 06:13:58 -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-acb6ef41605sm115901966b.124.2025.04.18.06.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 06:13:58 -0700 (PDT) From: Luca Weiss Date: Fri, 18 Apr 2025 15:13:42 +0200 Subject: [PATCH v2 1/5] ASoC: dt-bindings: qcom,sm8250: Add Fairphone 5 sound card Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250418-fp5-dp-sound-v2-1-05d65f084b05@fairphone.com> References: <20250418-fp5-dp-sound-v2-0-05d65f084b05@fairphone.com> In-Reply-To: <20250418-fp5-dp-sound-v2-0-05d65f084b05@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. 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 18 13:13:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 14057186 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.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 37C7727702B for ; Fri, 18 Apr 2025 13:14:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982044; cv=none; b=JNz03j3FeQ4mbymNBT+smVWC/+Swf7RLAhwrobqjUsJLAaV4zq4zsyE94Vg1pZqbU8gVi4yOKWmxuN/IBJOtDUyzRcMALA5FFES9gv/H4MakjEG53PBwSb/ohveNlApztGciBo5jx2lsTVoL7L8AWfOiztFzpv4XuH41m3d9VFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982044; c=relaxed/simple; bh=YzHH+rPNmlCw7nAjTMSEOMMyWvfPWgugAOZbphqTg0U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gPqyBv8tEWK8NSDjK3mD+RwuQaKbcI2zZNbw3mnONAHnRzapecMh0e5IDcUIttng1wFn0KUortClHC9ILL2Me+SXSS2SxgcKMQaUate1cNEq7h5HIE631JiV4FkXrxJeiTpnntIjkzCyn/hhEFPjLQHbpCLF/IqvpwBp9LLwlg8= 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=vXG3U9ER; arc=none smtp.client-ip=209.85.218.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="vXG3U9ER" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-ac3eb3fdd2eso338689066b.0 for ; Fri, 18 Apr 2025 06:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1744982040; x=1745586840; 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=8+iXn1oW4dzOU1w6dTTVa2iMvBmWei5kk2HA1UjOPDk=; b=vXG3U9ERiw+gC5ee8RwFhcBpnEsu9oKkfl9Bjrp/STu1WBM2yM4TNzZhwWvCYBkRgE nrAocFoK9oqj1zSglBMf3P9OGIwlb9xVq/yVAcrPmcIuYowihDt0VqwXVo3H+jxF6duY BUxP8+4EHZYLVsO8l7ylAJMJ2a+GxRMZcomqkz4mnCFPo9h/OBXm4DBbhUJ+6R60ZhtH 9s7pb+LKYvLoL3gonwJYKVKaAlJxF8fuDkhny83cFwLBNHQ9pwMM/NO2S8MJhnAMx4YE H4Hd2uCCvfhGzrgGljqH7fBMfIAz8JnYTSVllcf6X2ZpqxG/83Qbvuu5+sILdFwMXB0N LXZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744982040; x=1745586840; 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=8+iXn1oW4dzOU1w6dTTVa2iMvBmWei5kk2HA1UjOPDk=; b=idggh7Tb6z41VIOeAwhVuAef8UlnTnb35/6549tXPw4YtdzwMIcxk2NBOgy8nkpr05 z0BRic0If2MM1H5YebgZ56GiG0/uiUCBucuI5mIGJFF4gy7OHYB7fe4jSwXhO/2+nCW9 j7ywBsSSj2abf+lrMo9rYFvwhl2k1bKiTt2dyoFqZMfA5G0e0q5mKOm9HRoSy14MZnKe btwObzSppGNCZxv/0wJPex5S4uccp9Xf28Q6WeUaxyoR19QLjE4kVKb8fPcUzCJ1KBea Pgfjfy7zRrzkBRiui3Q/lBCOP8lloivReJRaS3fu8dEZqgdZh8T3yODUeYn28ZGIn/Dv T/tQ== X-Forwarded-Encrypted: i=1; AJvYcCX+yNxNmaMChU8jelLDsh0IQWxOS25G45c/roo7ABcd4JGXZc8xAe/f3nF0WAZDO5akbNsCTwN6pkJ5EQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yybg1DYpbStpfsgB4Hf3tD5ERi2rrERwp/KSSpjkwRer6yV3MzT pTvJllUARfRKNsJYGxS4xlBGfh1EZgglJ10TUHN3mBiPbAC1mOnoPxJ5WlMMnm8= X-Gm-Gg: ASbGnctjAGAICZ0b5mqc+83pL6/wGBafz6fVJxiyxT48e0oDy/bQBm+NeGBoCTaKLxf CVe70ej0f8xBWc3ku8J3mZojM7StlF2m6/YwZ8bFoVcQlbvAemIJLB3mUFnWTOktGzKbkLmd8Yp pGXoIG0fLd6p0kfI83raLd5LnGwDbi55xOcqgcohqyUGJtYJQXh7qjTB8wSS/GsImTAu9l00kIi ToPEddC5+U5Pa/ePAO7XovgdCu8suFz8K5wf9TaqfBLyAdl5bhZ3nFX5vNXd4JzzN7IKQx8s1Fc 8GXD8Kr9G2SnzzCi6hd+83OAONP4fAZQVRrFwqlLKqyH2aRDFyfYkHIZE2q8b+hRcmMciXNmQCx JNuEiCThh4tulEg== X-Google-Smtp-Source: AGHT+IEvyHMxyvjGL4iGOJh/qfXqtVq90WdGbNIlyJO0slfHahtv2sJybNJICOISqOrAqVq+TJLnEg== X-Received: by 2002:a17:907:6d19:b0:ac7:33d0:dbe with SMTP id a640c23a62f3a-acb74b8e568mr220791766b.33.1744982040350; Fri, 18 Apr 2025 06:14:00 -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-acb6ef41605sm115901966b.124.2025.04.18.06.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 06:13:59 -0700 (PDT) From: Luca Weiss Date: Fri, 18 Apr 2025 15:13:43 +0200 Subject: [PATCH v2 2/5] ASoC: qcom: sm8250: set card driver name from match data Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250418-fp5-dp-sound-v2-2-05d65f084b05@fairphone.com> References: <20250418-fp5-dp-sound-v2-0-05d65f084b05@fairphone.com> In-Reply-To: <20250418-fp5-dp-sound-v2-0-05d65f084b05@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 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. Signed-off-by: Luca Weiss Reviewed-by: Neil Armstrong --- 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 18 13:13:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 14057187 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 2319E277806 for ; Fri, 18 Apr 2025 13:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982045; cv=none; b=rY8QqOp34hnEg+Wp3/C6iLe8ZoK/NwVipzZNKFeuLV7dwXAJES1nkxaJvE9XqzpeMs/ejCTjVJ0jg3tWVVqWGkqodydyLuYbR32FzLZEtgSGge5w1xQ5BZs9YEdIEF1VXHb+JRHjqBQqsQWzpq48cquNabfWdd8PFfnhQJiIq9M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982045; c=relaxed/simple; bh=6LWWCl+fw76HY+PZdOokf+xdGWSBmr74emQwtZNOoaw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i95MDyHVAGr8x5cL2u8/t6tPvMkLoSNCTZA+L5rW7Du1Fw0UwI8zUKCNh7xtk/iarRIfDHJ/CGxtQlNZniK4ibIWouAmOilIDLUm9/URelKVxdSUGYHELhNLjgK3/wC2fpDZLUGbpVzL/d9QFcQC9YmmzwE+Z9ZeRMtiucrUBvA= 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=SyiuupG7; arc=none smtp.client-ip=209.85.208.48 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="SyiuupG7" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5efe8d9eb12so41757a12.1 for ; Fri, 18 Apr 2025 06:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1744982041; x=1745586841; 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=Ih9KqGuWJ1rc0JvwhZbwATHF/82WoHzu4xe2IRdIO6A=; b=SyiuupG7H306YWVn0b4dY0TBaDmRtwIL6sVFw4/ennSWl1NemCLouC80dO3bUVG9Um 5M/dfjs/DRX5qDbpVBdQpLP1xQsr8pxzAZFgxyTRCmaQVwQc67Rso8gQedp4lsJiBnpH kMLuz0gB851OwXqYcAQw7KMa47CZrLt8c0e/WZwmkWTvYK4xGWTQtja1tBUSnf8bzHrY H4VWnrlbLy7K4TQ4qxq/w1L+Qw4zGb2DVJzmL6SvpPm+13fTrsbvW+H/FBZ++BMqJa4a TwuEzCX82+WpaikrPTmMnHehN5DtBl6feHHLoAF7v5WD7Ewk8p2KFaxAYRXpS7c28OQZ apXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744982041; x=1745586841; 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=Ih9KqGuWJ1rc0JvwhZbwATHF/82WoHzu4xe2IRdIO6A=; b=hY6EoLEjGHGwDn96Z5pRlAtrLoHEVZYmtM/95AoQ1n07A/hjy3JIFvRN0RGSiSQolV 0yP7+649Ka/toB7wiW36QvnNfxbg/CBVeG4GkWIvftR4jOuOEWWt7aFz7iS8+OebzdoE Zqb9Fix7Ag5P5zDUC2533zahqNKOqYNpl7itydibA+MDOF70VfMBDXueUDwayV7fqmIN kgFe7TcKQK/3aHf4KsdRHJqfvK0ny3tpaS3MCiA1o074wFDWNZTdV7xMc3LtgydBwifl HWozHtVZjSjQWcxm/j0JAIyPma0UBQ/FmG6LEhAysEYV/jSN760qa4LFQtyTPYU2K5/j a34Q== X-Forwarded-Encrypted: i=1; AJvYcCUstFvou1TpdvvlfLVxFYw96eAuDTtQ1zfetLsD0ni3KoOvCse3CzK5UiCe7gK5vJaJqcaoJ5GxchahSQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxovTm5Yc6Uz2AlsjSE5ibnLmzYSQo1vjMVZUtHrLydSmJsHr4v crKQ13Yl1bj78dgtkDW6ZqlsJFCUnZ1f6OTHLU5FAlxnVVAzyJs274qzAg7RUgA= X-Gm-Gg: ASbGncu8Vr51Ei+l0ZCozZMo+dAQHRoSScE8npMjECGOzHHEQvCOCOv0yyWR2CHkVst M2s3lJSdpK1JYyOprsW3f/cfAkeoCE3zbhUua18KOEKO1X3j0nQ2+IMXFCK0E6IvKDjsiJDYTh7 oMpmudpNi18zOlCS3J4hxRjuzL5zj/pO36k3zl3CsrE73mtuCH6QmPg1PWMpA8KqfxU5WVSNyQT b/SGArGWxV7e8yh8/dHjJHyJ8eR1JN4SmCMTUJtEtTs5Fy4cfY6w3xHxUKhEVrVBpA99B+yEKi/ sNfhBtUDPyqArBBTut9fcxIzPhkHntULnYD8IsUda3UopoGggNDaorYNITJAWFoZQ6avYs28Fan znzTXxq9FweZu6Q== X-Google-Smtp-Source: AGHT+IEQnUcQbXMaqk61okzrXh46x/KQ61UJQzrcCrJS6MAJvzXtug796hcDtEBAuUVns86R4gHd4w== X-Received: by 2002:a17:906:6a23:b0:ac7:391a:e158 with SMTP id a640c23a62f3a-acb74dda17dmr237991466b.59.1744982041377; Fri, 18 Apr 2025 06:14:01 -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-acb6ef41605sm115901966b.124.2025.04.18.06.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 06:14:00 -0700 (PDT) From: Luca Weiss Date: Fri, 18 Apr 2025 15:13:44 +0200 Subject: [PATCH v2 3/5] ASoC: qcom: sm8250: add DisplayPort Jack support Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250418-fp5-dp-sound-v2-3-05d65f084b05@fairphone.com> References: <20250418-fp5-dp-sound-v2-0-05d65f084b05@fairphone.com> In-Reply-To: <20250418-fp5-dp-sound-v2-0-05d65f084b05@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 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index e920b413b762c803cfcc4049f35deba828275478..aa3b4bc3fcc7b8a8dccc75ef1309bb26a2a8105a 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; }; @@ -34,12 +35,17 @@ static int sm8250_snd_init(struct snd_soc_pcm_runtime *rtd) 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: + break; + } + + 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 18 13:13:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 14057188 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.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 BAEB1277029 for ; Fri, 18 Apr 2025 13:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982048; cv=none; b=juncjYxVJO1lfAAi05bH9y7vkL2RUnOPjVCOK4XO66+81Ucj9rZo0XtfMo2BQS5YMty5RY5vkHkg/+ZA74nSWnpW1jAEWE8DdGaTPJDRWWYO4PbaBjX111vcGKTSf87dL1eC0pPVA9lBiYIdnRtkKOk+nQ0+ekw2RwQntZrVMmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982048; c=relaxed/simple; bh=m+PMYJAHzPiWvmBUN7s4MjbXhEue3cg4fhj99Fq5amM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Au7Gy0Be+7Yf3IU2KioKok5wPwiD8mi4buIXzEpzknqGNej9W93IT0SXTaG6i5+e37vgzc5Xq/pJSW9+io/ula/qv3d+sz/ubqrICCtMrJa3rkK5sg6X8BAQfIUb26o4dDVaD8op83jhwKIoGgs6pWaJJjQnvNCoNuy4Bpijwnc= 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=yO989wWw; arc=none smtp.client-ip=209.85.218.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="yO989wWw" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-abbb12bea54so284575566b.0 for ; Fri, 18 Apr 2025 06:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1744982043; x=1745586843; 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=KCvYbcr7LrU2lgzZsZvyD/7tb6wHoKL1gjL7KsvY9pE=; b=yO989wWwaqXWZeANO4cgUBdurOAAhBhva8LIB/3AA0+Jo+/sB53Uf6hbkPjvq38MFS XYmEfeW5MBr8xpvXF025xW4ld1DEhVnDDM1/pbDq3sOhetI50ZYISVnuus0KfQM7NoGV RA0cwdiUPZEAwfI4E1FRTcOffPqOGC1XdDwWloERpAXwGRqfKDGV/TClbCTjo7pXlfAk gadrFufbSHXj+1MvB99P0PmROMvTlYTGmEy/mP5NxbUTHNk429Yt8PZSObOmSZqFzrPk nFEqrlRuYuWcwKIQCt+WuSEZnTkfoN3SQGq87gDq0nqwUVzaYHQsI/54C/QVwE1Kr0GY T0ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744982043; x=1745586843; 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=KCvYbcr7LrU2lgzZsZvyD/7tb6wHoKL1gjL7KsvY9pE=; b=dTOrrtd8j7MyqjDpKhJPCwsIEI7dTCv2miMDNN1UxRHGMa+k+ZytDxcuUAISFvgNUX cbn8EHA/EUW8nDeXlJYR69zKCzpZ5dkCc60O3nmKP3oe55BjM1E5TPce0hIVTK7+du7X LZ3IXMfhkkrF8CfRyYqR9cVt4EX30g8bJWD3ySu4MGlHFEXNNqzQ/Z/79wxdO0xCbHgL MKVTbd6RfHJkNomlbGRV4uwBQWiwhRakqe+IXloUCquvkz9skgeD+Kg/Tecyd0fwjjwG jPhcQtCGdcIAQ961X44JozDQIiRBsu/Y3uFIXYik9y9FsOwK/nIrdYSZThd6nv5dm4J/ L11Q== X-Forwarded-Encrypted: i=1; AJvYcCVtlekGEHWgUe9QEb52LHXG6jFJYOyPNulxu+ZKnRhKAMgBzXNK3nqpVPI9GTM9UqIY5Z7VMN0GBHUBBg==@vger.kernel.org X-Gm-Message-State: AOJu0YwAoGkTOB2JbZe3mJtnwIhBAm8PnO/0Ui26KWXnYVQ7BYqNe1YZ R+Pduw7Qmm96u6KFPvVN0J5FeY95ZnFFqvUyGlfYfr+wSAdy56QFPVxnPy+1DAs= X-Gm-Gg: ASbGncvPJ40U8tJuZVRrdPBPjwRw6mIQXtENaA98tH1mocjfnDn3vGSQrzZj96xFdcQ yYJYsX8GIPEU29sUVa1g63k5/6pEsvqEDjyi4rMb+rs3l2BIRCPU4Oi9DNqr1YfQMn8sPE0140a jhlG9i87nqmMlhs/2BO/nCGIMmGtZX6O9kx0XngcOf+ULZGa/zMyHUf2w2FfpKOfABRVifuvhwG Yrrd9i4XWlNXQI7g+C3tjkpDKD8PYPlziaJeXPDXiv2ZHKOTwy/wxA+lrQMchM7V65EpqNUUzHH zN06q/qWq8x9jnbaB+7e1mB9eIXYd1P2Z915fcVFa0VzU03Pmrj1laOiYe2T2DTL2wjM4Hsn3X1 E8wtsOk1yWvgq1A== X-Google-Smtp-Source: AGHT+IF9i+qy4bQxvdAhaulCC58fLAGLSGbyOONZRqFPtLgJ+j16vp+WVixcc2FWtwJrg/V/6FPSZA== X-Received: by 2002:a17:907:9712:b0:ac2:7f28:684e with SMTP id a640c23a62f3a-acb74ad7dcemr235285266b.6.1744982042862; Fri, 18 Apr 2025 06:14:02 -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-acb6ef41605sm115901966b.124.2025.04.18.06.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 06:14:01 -0700 (PDT) From: Luca Weiss Date: Fri, 18 Apr 2025 15:13:45 +0200 Subject: [PATCH v2 4/5] ASoC: qcom: sm8250: Add Fairphone 5 soundcard compatible Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250418-fp5-dp-sound-v2-4-05d65f084b05@fairphone.com> References: <20250418-fp5-dp-sound-v2-0-05d65f084b05@fairphone.com> In-Reply-To: <20250418-fp5-dp-sound-v2-0-05d65f084b05@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 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. Signed-off-by: Luca Weiss Reviewed-by: Neil Armstrong Reviewed-by: Dmitry Baryshkov --- 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 aa3b4bc3fcc7b8a8dccc75ef1309bb26a2a8105a..ec5372e18a9c9bc6a80412adcc5ec473e9730620 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -211,6 +211,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 18 13:13:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 14057189 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 8C392279334 for ; Fri, 18 Apr 2025 13:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982048; cv=none; b=lH+5mV9xN7iN9j2qAFWqnYu8BauKwlECuLzt31gI0NdzicC9bUZ9UfVOeyMz9YNxT55N837ZpXrN3GAp486SDPmKuP3lauR1fejMgWqFeAeEC+ZFjj+qy0iDXiN67usuHn8gHyg+zJhLjlCwJIDu8HbGpf7FjTkqKQDnBOYcc6Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982048; c=relaxed/simple; bh=7W8nlNtWeSVZAoWHnHqSB5kTMZ8gnqpruhrnUubBDVA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZHAQ05ZfBU4r2PWnvNyehQQ9Ti6GQcgmaO6jOOIeg5dFdxeIkrJ3/7K1CjMjWJqeEWvO4+G/JPixNoEjMrnxv1LPDsf3v379XIFrPmmZ6VvgBoFkh5755RK51sanewH04jUyrS5rOvOk4nxGwu2v8fkTFkpyeumQzstm9UGc2D0= 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=eAkgn5Q9; arc=none smtp.client-ip=209.85.218.43 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="eAkgn5Q9" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-ac2bdea5a38so279427366b.0 for ; Fri, 18 Apr 2025 06:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1744982044; x=1745586844; 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=s2opD8nWNn1a16aqwefGGL4ApPA8i/bb2N5C33dKCms=; b=eAkgn5Q9ye2e2Vof3H9Zxxsv0LeJP9fAAGs5laxIOv4OUFi2fx5QCACZYRZ1xc7FAR k9PGZtfBTFYAiOll6XNKqJqFtxIJJ8nfg20KnHUzemZ48ZTyZ/ITWGFqZEW7bG2Rm4Gj Kya4WBhcSeOcT8pyAJzSVEYMCke/7v7UycUmKbAaHwTjM4VJbYHLOF+amZEsl6YHKTym 7LSOFXya/ftVqNcl5JkgOjDvpyvTYtvbXHRKAhtmyoYhQJk201GswqzfnsBg+5MFovGA 2c7rvIbaTYvG+N3BYQkhdutCzPodXdJbDreqYZDY7ehxvMJzWD694U6cWKz9VuFPt53L iYZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744982044; x=1745586844; 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=s2opD8nWNn1a16aqwefGGL4ApPA8i/bb2N5C33dKCms=; b=hXoTqTfoxPyY0tIuwwbi9ilHBR/lBWn3sKGbuKsoKWhcLNpKp+2EbsJHwhLfNnzlvT yuq4zTLw0KrPWvgPeOjG9ENIAb4j7ymN9W3aCNY1HF7cb4i5RdpWoDjost+/ccEOT+qa rrM4Aa7Wt0dVuV2ytLNBCedU0HZVGTw6EctOeVzoEKRQkcpubKsvb0SlnV4DBfWSeytM DVS6jY2wtvDyTD45AcsFMMgZzdv2S7D/tAdytqBbO3F5gZQf0bl0KJJyIJ36twvB1JP/ qcHCR2NCCmFxVPKQiaivnAluo/Yn1qXaLuf+RVhZlSt8MRG1mn52DI8DAB0eI0AnnECG pWjA== X-Forwarded-Encrypted: i=1; AJvYcCWYw7FX+4AFh/w8F+bmL3sAWWPaLvlHB8fUhTQTHiy2HHsnihTdIH9b7N1M5j/9IbxXiG+ha1MakFRUfg==@vger.kernel.org X-Gm-Message-State: AOJu0Yy0w2P760WA9nrN4yhFbVHBQ1eVBM4j7hplOCMr32F57Gpk0ddp 7v9ZbySpvqu4KiVhIxZfYVISd3c+IgnevGl8buZ5RTZXsPXyvqaM5mkqT5ZBHAo= X-Gm-Gg: ASbGncuwTCDwG9yXzYwvopaKEd7WDXj6TVIv5e4Qz2zY5mpeyrrt07Hq47ZpPg8U39M Tjjr4H4P0VfvoGL4ppB4R+pjhIeNZu/lSwS4Io8M+aMYnq68jDCpXr9JPuVU67/PzD4k4w3KFWb +LxDUCcHeuw678GL3JfmeGT/C7vMw7gHfQXYSoylPgrwBHYoH6DBTygbCFuv+gOUCUYQC/GHpuK 8/ebMRRag9kqmRrJNp+dvTYNitYwvUhlJ+RHxg3uPetY+IZvvRftWquEkphoN3LeLzoGdKb7sey o72b0h3vcoVh3klXKVPISCLFQ8n4naQC/OArLY/e6AroG2GKMjadC2GAwlbTHBml3w9Br8GLvQC bmBQ4AchmOdjh4Q== X-Google-Smtp-Source: AGHT+IFTPwO4j2zMKdap8t+bRIhg7rN6LnVakCV5EvwVUc0rb5eLZEGy0q9hARUTa5SmeCSVugZM8A== X-Received: by 2002:a17:907:96a4:b0:abf:4708:8644 with SMTP id a640c23a62f3a-acb74d85693mr230821666b.43.1744982043795; Fri, 18 Apr 2025 06:14:03 -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-acb6ef41605sm115901966b.124.2025.04.18.06.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 06:14:03 -0700 (PDT) From: Luca Weiss Date: Fri, 18 Apr 2025 15:13:46 +0200 Subject: [PATCH v2 5/5] arm64: dts: qcom: qcm6490-fairphone-fp5: Add DisplayPort sound support Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250418-fp5-dp-sound-v2-5-05d65f084b05@fairphone.com> References: <20250418-fp5-dp-sound-v2-0-05d65f084b05@fairphone.com> In-Reply-To: <20250418-fp5-dp-sound-v2-0-05d65f084b05@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 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 Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov --- 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";