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: 882353 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.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 6F727277006 for ; Fri, 18 Apr 2025 13:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982042; cv=none; b=kVDDAyOT5097G7sCJ32fYFu999gQHgUxOQPJzQAtRkF/VAF7S4vXYP54skN3fnHc+2HzbxWZJXs2rcpeyXAbSgZCI0J98lWCEHD9wdnGUUrkOv34uO9kA9uulnyBEkv/u9B7uTk789pcVf9D2SyJglMT7P/vKjdAJZxXJDsYkVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982042; c=relaxed/simple; bh=wzHHP2feP6wHuqFLANo3CTLOjrw0/TxeFUFRj7B0ILE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dxY0Bb+2UZl9bVp9Z74T37eVpSFeNTO+XfE/31WyQs5xVOsxSESsG3cUgaflOzcgOeqxq5MfE8dGSnHyPkv2nqzCDo2jN5Zgdi3Oeq7RAdfyvS/rsnvC8sGyT5nuphZ5DK9eQi/8bV144JIdhTNo/RVgAoJmODfAoJy4HGzGV4I= 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.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="lRXLUmeE" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5f624291db6so1522388a12.3 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=P0DqNxjpKxCDUuiRlb/RqaScm71MhBMOmgN7uCBqYsHuWcL57PAKstRlDGyzGxmHdr lkrhR9G4hYx3Vtqc9N0lALgMzI1yLZhP9bJkrye3LTJeoauWWv9sTdhHtCw8zJRrjUlX ti8ECAIhElvHdh1cwyHbJh9+S+i5AXQJt1tYHv+xFtJDa+KfHqhdQTGpfjqGmprOMslX NQrTVGmeZDn5aArSwtn9w7pUuCnMI8N/xxFO3IZdEqpjXKzrp7RlBAVrkFwGLyUvRChC n2Q9YoXsoGL/dZttpCfb/8QxvJNEyhuHVl7Q5g62JRU6eAaupw4dO8ZuuFaX6mvjgUZ/ j8zg== X-Forwarded-Encrypted: i=1; AJvYcCWhXNSepxT3yzl0B8ye1bm1DceRyHAyramIqCwq9IEjI9nOzQujkTLMEvaRIVSipF10AheGxwFazr6NGJAs@vger.kernel.org X-Gm-Message-State: AOJu0YwH1AbdL+Y/wgsgCqcxfvzRk9XqMb6DJ574BjqexdZFAUZZ/Ldy Yu1DUjv1IK5Mzy43d184Nit3HP1C6iWMhpDu1Uym/Ob6PQRHDOVkV9Mx6Wf2Q00= X-Gm-Gg: ASbGncsVSaDiKKCP31zlINZzyiEA1NHn9a08C8FqXncUyWowwh5QlWIEYXJicKFEqPa j9cd05soZ7jPTXdfy2brnbMbBFG+CEIFEZhBZ/3lsY4XV7bcXkzCrHbyGxZnVyC2e5wi/HvkzGv P5+zZvhGCMnhTHJmoEP8zrfORf4bvSmaq2wk8fWqK/x0NbtW1/H9qJVidAQhSp7sO4X5BSggiMx mtr+54v6MGsJkkt1rZnb0yuwvrIcQDqGt3aYAX5z1J4KaRtGkLzY9FDgeaIGf9AX7N03LLXUc+a z98NX72Pi+HsHGZ36tEWKKMVCh5JIS4tR6F+Htn1vBJGU/3fBsmvKd1b2czE7Ta/r1DjxjaAJSi zCnMiYJmGZKYHig== 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-arm-msm@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: 882352 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.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 36755277029 for ; Fri, 18 Apr 2025 13:14:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982044; cv=none; b=MuZRAgmuhworQ0NOtFBYxLtZLF0CP7hn3tXQJKzrc7b4c9ZP6+jivCggoAj/Y6WcEd2ubsP7rckSKRLwDqhyT28xfKXrC48hH4O9WtmNi/01vc/rWLQd1A2iVw0VuY8Tcft/f1oErIwDNwYr8Gz4cUFx3R831OTFsdZI+OJaRw0= 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.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="vXG3U9ER" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac2bb7ca40bso342065866b.3 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=ReXIjWgUfwcsKXACoozq3DnTatELyeI2t1SUjCrjaDngg1f5Uj7WqkI5q/pfgGfKQJ gy/fvJFyzLro5uXH3gegHtoeQeQtM7mV3DIDY2seInlY7qOVe/P3NOQDPjvfuVyY0yOv Dvnht7u7BgdvHx2tBHM1Pe/xC+DzYwUjTu4AkYX6G72+H5bZOW+iU3Cqb3Z8pe9whH6f S9lg7uQUAniMQuhEwea8NUfl9/7oz6j7ZfOTI69vZk6Tt4lhC7TjlUKpgBVEweYqPl2T HJVplMQM8G92DdRv5XV8LnfbWHPeYW5RpJ3d5llMPL9wqzsNlsub/iOErgvAQ8exCO+J CClA== X-Forwarded-Encrypted: i=1; AJvYcCW81USp+mBgJ9jAyQsSGCVdm5hH1q8crrn40uXfgk+kpCfYMaKjZZAoQqnUoxZksxi2jwhboMUCF90qK0rI@vger.kernel.org X-Gm-Message-State: AOJu0Yzy0rgqXYVkF7GknlOjJy4J5doBszg5zusWG7GSPTg3bNFJnZIr NfI8mueIMMDhj3oIiRD62UYdQ/j8eN+E5YQWR3AhbeYT8xJ0j0H+Dy4qG4dQNig= X-Gm-Gg: ASbGncvy8WMV3KRw3mkajl2M3IMZbJHTn8JIhk96B1mWj256LLzee2PSXOuyXWMknTM n+hRWTw9E9Jw+CmUjYxHT8vr2hyBnL7Fr6uYdPgJPKxZHN/mUE2sFXNP3baILru+LCL5Jp36fL1 6uuA+zOCcaTurv6eWUR7knTtfoMi3vIXhK/hYarqubCcGeUTpQBlaz7JRHeka1J4gt5PtpyqpEs UhxBmSy7kHseEp7Yky7iUwLMW9N71cOOV2HPSCHZ4zFV9Du2s6pe3NEJFnktiGNQPPY5WubdZGZ h0JpkE4H3oFlsy8PP5mQP4sCAZZVjre/bDmjvTasWXk/X6Y32UfHYYzfSo275XCnXvXaGEnP1dE hxs601vJpAlUI6g== 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-arm-msm@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 Reviewed-by: Dmitry Baryshkov --- 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: 882619 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.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 27EA5277807 for ; Fri, 18 Apr 2025 13:14:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982045; cv=none; b=tEdl5rnLa9CR4DG4ZtTKX4oGWY1+9T5e7juCi9Cpf4GzxIyKYi9cLXzWy4mhul4OjamBGWLfTFTVAdVN1d+fufchAph5tHpcDyHPhVcdsI9YVK8xLd8Ti26aTmKTQM3tV7Iwb1NFjt53BT1iGnD56QtW2XcECFvwIah62/N4tIU= 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.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="SyiuupG7" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5f4d0da2d2cso42771a12.3 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=sg/dqlgPQFj4ecBIe0bjFPaMM7n6lyhU7xu28BLPqUMnfgxJeBYJ3kf2diu2BY29pf DqYiwgFLCpKXS8mz/4xzIdfRj0wSI5aans8BPtfLgm1Y7kPFxg3eZTbNOQpmYVgDkd0m I6e9SuIg8P0SO435nOxsH21gSuI2oioklZOm5Ejm03fSu5YLpBhpZ1V9DCpnsFStTb69 ++mN7XmDH2PdWL98QTCXxL1G7+EyXu+gNaMu/2sXvmqxNVwEICTyfOhSxVDu+09cbihC OpJTEhsg9tJvyyhFCWbl4GVioYOM4ySIkxjblwnCYlTb/McTuPpZWfbXv0X24ZRzEduY Za/g== X-Forwarded-Encrypted: i=1; AJvYcCUfyiF/AgAjvcF1lpjZEiP+WDu51zaIWjbhAPwGd1kXLJr2r4fipU5bDZEekgaLlWo3FZZ0+eaX0vR6XbtM@vger.kernel.org X-Gm-Message-State: AOJu0Yypg5nJ69m9jAWtrQwqC7+3G7MpcLkbWGPQU3wDhdZeqYCoOP3h fFRlZvjjWkpHwvny3793MwVPvX9xCC39cxJasgXBvlYMUktR2qXPPMFqNY61mcE= X-Gm-Gg: ASbGnctJNACJ4tbJEg26t17fZLMml2lFLHHHPZband3+epWEDrjzGT01htgZaES4SfA AcXhyjaEwrepo5fonAzTRAeMHYhohlfEHg9vsfcs85NEHCU0d51hO73NtJN4PR3/2txI2B8zYD1 y8db4VgkKVYSSfA+Il0tcTmSyyrq0Crt/SBQa8/PcmVGFfrwj4Txq3by7hWQ15KXKC5NgQjXNJH XI1UItTbhk240OC+LWBjzd77MrdTsSuDpz9cLp0eUg1UeFITj2srUSB/jriAqfRHyy+b5TCde0V m8z/VW5Np18DRnzWGpTZfN3u7LVBVTrryWR/HZ6szWFB1TRzngwJ8CCduNM8nmFjpC3VIf08BTe YIPIm9amKY/TJ5Q== 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-arm-msm@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: 882351 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.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 BB7B4278162 for ; Fri, 18 Apr 2025 13:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982047; cv=none; b=sJXW0lNJ711mbMone7c8JdX68Eegemd3E66UfCbpABLUV1iDKJRVnlqkkp3OHNsU7CWYEsJnOOyPrLiALoI+z7a0nZ4AFoHZl8gF7Y9ELDhVrMHJxRM5T6ho5TKRprf5z+gu/Qje1/1RfB1J+Eu1jI0ZqNqHWcjggsIdgJ/6iFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982047; c=relaxed/simple; bh=m+PMYJAHzPiWvmBUN7s4MjbXhEue3cg4fhj99Fq5amM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LwzFp8wX0JLUbLeGKdvJh2yRvZIUm1MNnGYD0R8cvJBvsdGZGpIkd8dbC46WyUKJtH4HpUaOTqXaK7ykY2yIlWw6lqArStgtZ0YRFd+phPYASCGmTLLw1GuCkD3DGvaiwF7AUf/473yNwXhghPRk4jK1SwnQfDNfzU8LbRvR8kw= 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.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="yO989wWw" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ac2dfdf3c38so346296666b.3 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=kwBkfQ4F6IndpVM9tGeK+RSF9sFKB6gB9CU1FsPWVTkzyDrVG2AAbQQ4T7e+3Cspt4 8jZMZ/92REfmKPkGuuIGnzzoYECz0uwZKsLdd/93jogfFURWjUOgzJgcSZgJPRhVjR/i kfgdcGmGwDVjgP7E6+BGHJw9cwX2r1hMew2WZ4F01zo85x1pft8gqNP2Tu9FdC22PlKp 4AXnKgHthRXnrBiAt/RDnC4LriWIxw1DzVB0Pd0VC4QeOFwZowq29crrshZuJ2ZDM8iY mnpcRniCaxTywa+AlHzW+FyDG6djEncemXaAuIQCqJlkQDhkmA3qQqSBiFwAiDNUz/pr lx7w== X-Forwarded-Encrypted: i=1; AJvYcCW6Om7rPC1jZ4++msunYEuXdtP85ZzH8aIeZ/9djrBex3CsnGojL/gajJjiQpPBu8Sc7JgRMcwDOLLbdEz4@vger.kernel.org X-Gm-Message-State: AOJu0YwKGXxJ9zwv+hKfJJRZ31iGcp+PsJNyLEd3O+5A4FO5txuMCdND +ItBFXTBfm1uRTmjYXCCoSg5nlSq+UTIaFjtZWutijUU13H9V1CBxrbaXypUf2g= X-Gm-Gg: ASbGncvwmFYuOtCQ5hYg1WLURONQG6bZs5RMIWTIPkwo4uxQ7ASDbvTMNLtyZjQS2l1 npMnmXnCiBGK2A0HxARU1KhHFkXK7ohV5Kp8GheA9SHsufIICyO8bhnl65NmSmAqtcAc8KHlZOL u65ppC22LFZUKHM0D1GdxgAXFJISigK2n6gr7Lj+ghfSb47o0Ma7ZspqAkJ3XV8Fm9QNr/ZFYGU btmMmEkNBDaVUWddST2E2WsMJ65xcJjk+S11eX/VRC4cSFdZtkkR2Sw3v2pxB8NBQG43sABLqXP mBnow2N5REpAE4SZcgtQAtDLn4yw4YwTRDnVkEdRlUh469k03nT+S4DMQrC7v2vFM8ehhXYNb+L tp6joii2znXMxgA== 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-arm-msm@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: 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: 882618 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 7B669277806 for ; Fri, 18 Apr 2025 13:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982047; cv=none; b=jdQ/M3TAKu6OAbuVfg4hnl6M1clTKWLxlDrG6CZvFRcwG7m3oL8Z1/sa15OSB70ZLC8bBFVxYI2/8Q7LotJ964NYyj+pWH7OdHfTX0LCTTCt80jzYfkuJzW/uQZBIuk/sNROsKINfKb0Vo2J2ZefJki9ThoTu10rVvnU/+xlBnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744982047; c=relaxed/simple; bh=7W8nlNtWeSVZAoWHnHqSB5kTMZ8gnqpruhrnUubBDVA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rxQ0ae7hGb2dcEcMJM+tX6P8SDe/DQS9KOFcq7p7KHN2X82EM6bJP9w8xQTbU9/lVX/4aEET1vrN2uhr5Y4OVxXAHhsCUWO11f5J2ssV5kvFPXIf22LkDJg+BWa4dWOTGyd1ymzojzChx7t5NHckL1ddAEJSyCGjlmH0bhVX1nU= 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.41 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-f41.google.com with SMTP id a640c23a62f3a-ac2bdea5a38so279427166b.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=U6GM28PtPv1gWGAjjmM+o3/JgSJyC5FjdUgoQ0JLBIrAq2MjGs7FZH0qZSmDVt8v5K imw5aHL9DKYchIrgS1hDMpfiV9oMSeUbBpHJi2u2FsxpkTHn3zp9/DS9IFuRRHPMPL+1 cIIuS8O+ZiCuEyKGyGCfwqlqkYF+xXDVRnxDphv8LaBf/mjl4aN5JZ0/VWVEhJRIE1HL j9pkOEnbMlJMRkIye+aiDQdF8EAUEMn6pB/s54hwFDDAv18ONrZr1zYh0+tRgv1xqBpk QRaA4/NxWaKytBdwv1amU6LEYnvzA0a++VnmGM8yJ3fJWcK2wQ7QwA41kPAVRFpPxUFH IivQ== X-Forwarded-Encrypted: i=1; AJvYcCUqhRTMJ6K2Qh6GdOp200w2aWmHHbgrPnl8jRrtdtoLlK4O751oes1snwRzXj6S6UFhaAriyLActmxEsZsw@vger.kernel.org X-Gm-Message-State: AOJu0Yx3OV+pzSsrML/YUwHaSsunQmwx+vmgwelDfqkAoL+RBpq6pPCB /VVCMRSVtDat5E1w8dLNaQk4Q4bcV0s8JNGffqbDgw4IusLRaw503uYJrC7SISk= X-Gm-Gg: ASbGncvwW8SmXpTxT4mVebKXPpZfY/gmgsFHlt1hRtf+nd/RWOMvYNL/a+92O3lrwgo hcIwXExGNGi/9Of8D7yYzm9iouQnc3qavi9SfrCZMpOWv/VqaXOxXUgDV00cWq7SPQOSSAi6aYB VbkSLpf+SZcWpgX7P9Y+ul6SZZ8bGEBNcMTPEb8zDBJazp5y6NmICpCkWQU/+hfV9V5mJqCv+XF IU/hpClczl+I3G6dHn7sSwCs5hFTD4weI8AxManCLq4neg0b5GJLCMo0sHvE9Uo03h4zgi70Kda 3gWnHPvqTDNgwK4PB6MSDwzBbmhmWdTa8R4jjVJD2XoIOHmy9zbN35Yo1kjJ1KkDPblmzPZCI24 1w+Ke0KMJWriJmg== 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-arm-msm@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 --- 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";