From patchwork Wed May 7 08:01:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 888227 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 76491223DDE for ; Wed, 7 May 2025 08:02:07 +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=1746604929; cv=none; b=sI7ZyPddi7d1FFF1Gd1L1oif9LXkCBR5snCakYG9db/idmo9CCmhaSyQzcPu+Lq9id57oe+ttcJhJi99amUJB/JxPkqaD4UQ8+1pwmJBe+mFNMRNg5TMLXr7hAHyX2PFfP8cRFCgerxSX+5WnSdUroukGXnBtWj0u+etaoNPPTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604929; c=relaxed/simple; bh=4r9tJ+EcKTSeTDqTruse8d4E3SvZHkJ5ztPCJLWlUSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e3J2Vjevr3ld0bwvzUzctqy8l5NOsxngdpvnWzFddcEFryZLC+gwLLWymzSW9ZsyKDFq4JuxwcdvhnwnXhZ9lI84pQWsCLI8ym52jDTp0nub/2yetsabBc3SXP3uz3W6BNlodKzQ2LqnX3HbQ/lOGUvNvYwDbUpr4wyR38RWxCQ= 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=YnV3zjdf; 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="YnV3zjdf" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-ac7bd86f637so129416166b.1 for ; Wed, 07 May 2025 01:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1746604925; x=1747209725; 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=YnV3zjdfl85huB5rFrTm7ILrhcQVcGxJqJVQJwCQl6ZGbIl8PxVn/ZghhjUZfXpoB8 o7THwPVwhuwbQoyp3tnHbTfIiubh79ibODjk8+R9J6aqB0HX0wrAmlFfdFZhYuwrHwYS 6oiFAhF2qGd9FVdNBAs9QoYKXQbzxIQ4OLTIur5YPpxwK6rvctw/7W56A9gcAe+EEd14 1bYqJko43S/UJTVhLXw8XSD8lW8VuIr/NnaL0C71olo6w560hsrHHQVfy/meDifhw5V5 A2G8Zf+fWSjoXEaAGYLj2aorwyBqfg+HuXtvnq6RWzsV0gaQqKpA9i6RCUH2FnNBhcjF 1jpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746604925; x=1747209725; 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=AUAoKtsOsetl718M5jBkFq9RHTHHeC0HMbrPxiAyoxoXkBBu6vIY8hV7PmaPVp/VZt bFnC4jO1yeXbgToWqzsDmsfJi6YZ8YXoU8KheUmKYQaR8tFVjpkZuOrGC8hSCc4BE3GP 35VqlqVMsLMmcooRIKl2v7LwyExoqvYbMiG2rIAxGWwNfy6QoOss6SBhGf59jB8zxqcQ FOb9HjwKSbhf8BqLmxydM+8j+S/e3E5sn/mbgmIUFVv3jY20hlUP/OdQ7jyVHXPZ07WR sb35XEUn8iKW0hIxt6+/4ZqWZyF/dsQwGB1c9Xp0xQQXTH30tIDJurOqnOf2BJh0oPGa 5jaw== X-Forwarded-Encrypted: i=1; AJvYcCWISdpdWg47gze+aB+CIlH02VhVuwAo8P5lX0526rvQXOUyUlCNCyJNp1C4Er2DtfxZtCHKARXHFSnYVp68@vger.kernel.org X-Gm-Message-State: AOJu0YxHXFXVbIhio6j8f1f8eQ+1yzeGyHSVrHudIGFBYXtoV6UDJAQj 71QGsFwoH8EeSqyEjJm3LQYsJivrYTL/gPYjHsKM1/jO1jQAEujZ48ZD6KCNIP0= X-Gm-Gg: ASbGncs9zV3SKsk53WSIQsFgyFnoNpJtpW5j0lqi/yBst0jjWO0DHoEn3lsVTkfV7xA aV14F7IelHYts08iTs4L/jN7vsaj7fcS7BNLSgH4TtsfGJRmnMj/+xXA0hlO+0i962GP8iM2Ji6 SHL3zS42TEb5jB9hpIj1eRy2kPt5szVv2DtsE1kBOTpTaq7MDHRps1TDYyE0pMwqAYMQn2W/C0C 4wHLXYSNdH1p9GbVkHubtPsY2jIcO4boQFNWzgXbhSy6yiB7ZRAxRwuOSjeopFqPeQpWHDY5hnk yeLj4Nv8fo4f9y/tj7JQmiBI8dBfswVC9i1SornICGKG3NepK6Rb/2ANtYJeiM1rKr5SxgY280M IldBk9MnnUuWWSg== X-Google-Smtp-Source: AGHT+IHM5j4LY8EC3by1L+VBxZrB2eMd8q7F5KhX7WQLdSlljTQckz7uR7Y8+kHuY5+YyPBVE5qv7A== X-Received: by 2002:a17:907:8dc3:b0:ad1:d0e7:a698 with SMTP id a640c23a62f3a-ad1eaefad5cmr195699266b.2.1746604925541; Wed, 07 May 2025 01:02:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 01:02:05 -0700 (PDT) From: Luca Weiss Date: Wed, 07 May 2025 10:01:37 +0200 Subject: [PATCH v4 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: <20250507-fp5-dp-sound-v4-1-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 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 Wed May 7 08:01:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 888654 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.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 47C5D224AF8 for ; Wed, 7 May 2025 08:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604930; cv=none; b=Jpq2b35Kpez1snsobIebVyCok+S7wooAAHLWLepTR5exGx9jkqEqzIdFGNJBUCRsiptT6SMKPn9eB94gYXNp5M6Fp3objyqhf7ul/Cehmji4q2EHZoCidqzib4EH/mPemfXtH8jxWYTxPTHS7JQCJ6nZabrOkFMuWiZtVHk0A7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604930; c=relaxed/simple; bh=dtOaJQoNaf+2+Orucnur3ieXlStFPrTYojY1S++i2ns=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WtKpNnsfjfbqz6ztXv2DjnE8SwFgS+H5bgorEoxAy62dJa2yjsmBagmJivwn/PEyBA6FLeKL0i+3nMLZmIq1FkPPoAvbzqHNxIpFEBgeObzT9t7aW8ZdqNq11/Pn4jim00e4JC/25z9DsJJfHUxFN+KQCJcE4W/4U9mJ3VQRaNE= 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=KIEYl/vv; arc=none smtp.client-ip=209.85.208.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="KIEYl/vv" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5e5e22e6ed2so10393683a12.3 for ; Wed, 07 May 2025 01:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1746604926; x=1747209726; 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=Ymrf5p3qgNDjGKRM25KEk8X6NW8oIyoL8sa280xKMjs=; b=KIEYl/vvjsTAvME2DGC9v5Hze68RxQkz8z3j6ec1I9XntyH0PXvECNa+0nB8YPAuIT gNu9vXwTxE3NFxIBSzbhZa9USFl3F1xcKgCKTB6NPgeL1d38i/adgD2OssDWl7HaAXMF 33L+396jIYeQF0kGlsRIHeC+5rnc/Dwtj+XN9t/kkwOM3vMi1r2KRQBw2Nx3n5XLhpIT Cb0pJfyzmwwV6IA1uu55rE1TynCxHdWLKJXRXefEF7j584Bod804rmPnUuprJu4gkfP/ rN3HKcs3ITnQBd5abTkDNf31MuXF4wd3QQDZOXRyMMTBXUaq3QGz+1pd93D/AdDd6tyW uH9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746604926; x=1747209726; 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=Ymrf5p3qgNDjGKRM25KEk8X6NW8oIyoL8sa280xKMjs=; b=e6x1hkq+SiqOos8LCkyhZCdeBFG9iwE1Gcvy0ff5fE7vgYFfBBeTawbYNkEOFytnWr sydGzDd5SRq65lGJVQiRtN7lJt1Q6RHE37OClZf5iGl/aUsB+SfRBs/DJjIFgKFqI+PX cD0CT/3EJ1PuIJJT0gLIWhjWCol1PHC6xgX5zs0u7D1KcOVrpAwkAxNpcH6su/9p+huD lve3yYwPhc7uf227nxrsjJaWF8TZml+PxgSHZHbsJT62ezGJnFYc+bSd5tNcoTaEwf6p r2qFMDKog8YTzSrsXxyJWcr4aLyVqLkagPqac4QJnr5fQ/sY+nZDGSsXrAIw/fGczmtI lHog== X-Forwarded-Encrypted: i=1; AJvYcCVRbPJ9gAzkQcjhrQIOMvCjmnaHIQLOt8cgqEXBdm05gNTdl5sqzylxyVg06/MlkB7VIUihmRkdq5x9lYJa@vger.kernel.org X-Gm-Message-State: AOJu0YzkXMH3zwuhCyT8Xpz4Sd5+B7kDoSVz5+/AnzfTGSMe7RlCBYr8 alzILugAKJt25i4ljzcM7ZqXIsqt+UfjmOk0oOccDuwfq7i5Yrru8/g+vAz9tR0= X-Gm-Gg: ASbGnctCVF7mhAUoilW4te5a8mYO/ynXgc470v5Jkz1NsylJ/YrGEwKehIWJP6t6IMu Y5kzsxept83QysjuHR6YQqhEGrJvZ9Yxef2HEPFKxy3v/lTdQxChjrkC4bxYakFz8gnk+MuSzTP dVODaxQ7i53j/R7ZrGRzMiD2m4ldFsZaBSdgRf1CM/KWeNLg+m7I/AZg1sbYJPW/UF4Vn5Kdies 29iGSggIKmDvdIEfR8Raw1tIzrdi7TS9kVO0WAb0iqnIChtDE1IeihUsnQ8IwTxc+XCcWtJEgei UL9BSCXUS6oortjovkVt0v2IzAbkB+iCbXlLWi/SHBe4lU0OJV9hHwKIiFxTqiz0YwQPFoTFS9C 468ie5RsTSw0jww== X-Google-Smtp-Source: AGHT+IGAPyH7HbVPqCuUPV9BaAjaKKOy0NfeuaFEjKeL5N0COS2GXXpBkjPupozhJr/p6eoyikdoYQ== X-Received: by 2002:a17:906:730d:b0:acb:b9ab:6d6f with SMTP id a640c23a62f3a-ad1e8e3556amr228314466b.38.1746604926286; Wed, 07 May 2025 01:02:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 01:02:05 -0700 (PDT) From: Luca Weiss Date: Wed, 07 May 2025 10:01:38 +0200 Subject: [PATCH v4 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: <20250507-fp5-dp-sound-v4-2-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 , 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. The QRB4210 RB2 gets its name set to "sm4250" as requested by Srinivas Kandagatla, and since no (known) UCM has been written yet this should not break anything. 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..f0d83a843765d8dcdd51569e7cbc95eb72292497 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 = "sm4250" }, + { .compatible = "qcom,qrb5165-rb5-sndcard", .data = "sm8250" }, + { .compatible = "qcom,sm8250-sndcard", .data = "sm8250" }, {} }; From patchwork Wed May 7 08:01:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 888226 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 4EA75226188 for ; Wed, 7 May 2025 08:02:09 +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=1746604932; cv=none; b=KjeMQmtiB4i9FoBx4Zk1i79ucYmilbN4pYrc0DrMoa3yjh5EXPAXniFWwnIXdUp8+MxQ/KtL1PRyY/rB768XU1d0u4cUvNw4cOrl1zdT/kCEkNaom5CAEr9kcb0sp+QrVfnspGYOiDBi2tlYoOR7Z4GjSLKu+FbbWQX0Kawb3L0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604932; c=relaxed/simple; bh=+NkIa3tRR6OnKKuCWg/7/UZBXPY1qcvu5koCiqXLwVo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=glkgzMNtlKQ6a39fvdf0tqI0opxs+RafITARlMfCjTaRLWvpBAUlgAnGLUBPkS2+gBGJ2K/hddzT32yVtaRWJUK0bCAcp7kozZgGsNvaxPYrtYS0r3dJ06ylxwSFpnx/VhcWPNF8nTNup6kjRTJvX92ci24RVEcfGAQscyB4hWo= 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=sr2/yM6d; 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="sr2/yM6d" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5f3f04b5dbcso9850520a12.1 for ; Wed, 07 May 2025 01:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1746604927; x=1747209727; 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=zEN0PXya3Y5YPAUDTh8Px+2+gU/KgrKVkv5tePKDfas=; b=sr2/yM6dnxNxPqEHg7gCYUuKwRBECOSfEJcdnvo8d6k3Y0fbTC+lzYN1ySoX+B9wFR OpwnnTJo6XCqDloc4AjkolinjkcOVJiEj+nVIA16RoxP9xaEyjp7UG8AIe2o0KsdPO7g 5NO9D91cNCq9MHACcJzNuI7XhMgN2cAQLLd8qHi21JyUR4CiX9uOicZUo6thFNcjwoZ3 UEz2P3pKTxRyaCA6C8DUojZkD/lvVBZ2425B6SxiXw3CWjZGG6yVzQjZ4N+C+9c9vdRQ sGPc/WNFNYc1julwKGKHXFyOW6LMRJ55b4PB+DCEUBdG6j1MmOo18o4VFCMBK3FGpBaL huvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746604927; x=1747209727; 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=zEN0PXya3Y5YPAUDTh8Px+2+gU/KgrKVkv5tePKDfas=; b=cuCf0h5uOYWyaVhbp6CIgP6pDv434LM2SLPLORnMoQ5CXbSVzPYn0X1B2Lie5QBHPW hqCvBjlCjJG0RJvTC0faH1b7ECcswj5sAI0FV0sHkMCEmUdPo+nondFMFhuaW/cc7aJ4 9zrwjrc2RaXYuMGZCOvC/g9qRaNPH4juQrLPfDqVd2p96qfXvibrsAD8dFpT3id9IYmA ogFidn+PVm13201WNOYGF45xhZ7adGRfRSNp0C5A87bLNhcYOOCoku1DZigEE8BxGhIR TyVV1cpx2pFh9QHsG+7KSs/gnf+61oE5c+CNoSZmTlwW/pCS7kYA9XCtv6Q0QQEIiYsf 7n1Q== X-Forwarded-Encrypted: i=1; AJvYcCVWfmJVBO7mt303vS7V5SVWP5A/g09vL4M/6eMPadK6VlJl0QUuMLO4c0V0qKb0WZHuN1nL11eAVLQOkniK@vger.kernel.org X-Gm-Message-State: AOJu0YwND/8It6iaFDEfXdzkXQ43BM7YC53Dz96en42Ti//M7wLt0fxy qVcu1HmbAX8pqwC1sUMUFkhG0Np7NcNIwYOimuneGEWcADAfIau6GP8PLgPGKzc= X-Gm-Gg: ASbGncumytJsnYvY0TWV+4Yux9NJLii6stbgwY3aZaT/FAdMlezRATNreG+6MSSHndM iIR26Hg+rDHZIJW3WM+EwmkCSbvEVoblCFtCGaiHtKYTyIIonE3B3pm2xgImE6zH4KXcdHCTnRK GTnflTJLu7M/h7lGAZcvYhF+xcnf7LY0CzFf+e+xOZysyT6Jtpwy2JZaSVGEQP0A1WNizm3CEXY d1hCVtNZ8bTIgU96i2RJJQlWfT3YhA9I9jvwXwjP0hjH3fsQ7k5ByEjtP4r8YnT8ZMTUxd08E5Q aSNal1Zm5fYERos8/Tb8kw+y7U4FwqM8NGP/6SShYcBUhE3Y2xRjdXDiq6F3KgqyQjMVK+K0ow9 t+uDOCndeJT2uhg== X-Google-Smtp-Source: AGHT+IFM7Oq1Xn0VIuxfyz3KRNIFNY5cp5qjc6oWjmusZGZM8KjZIdX1ZYRy5EquRLMrIpwTTSPwwg== X-Received: by 2002:a17:907:c28e:b0:acb:5f17:624d with SMTP id a640c23a62f3a-ad1e8d2ce68mr215405466b.57.1746604927193; Wed, 07 May 2025 01:02:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 01:02:06 -0700 (PDT) From: Luca Weiss Date: Wed, 07 May 2025 10:01:39 +0200 Subject: [PATCH v4 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: <20250507-fp5-dp-sound-v4-3-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 support for DisplayPort Jack events, so that user space can configure the audio routing correctly. Reviewed-by: Dmitry Baryshkov 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 f0d83a843765d8dcdd51569e7cbc95eb72292497..2317fe285ee7d41689d7fac453164fbe706744ff 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 Wed May 7 08:01:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 888653 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.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 1D80E220F2D for ; Wed, 7 May 2025 08:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604932; cv=none; b=SVOitEKuWk6cvI2SFbBFR2IwhqRNim2uN+IGI3vOJrb/bwBpnh9JGx65+N7WfG/2Av4gMll6e+pwRZQs+2dUIEDlM3snvC5BNk61IW1V63S0r21L6urlz6ZB+PkG0c4b0L4LSq2ohC0OZwufCOpontzlzkwNLIbZu13BpDAqGJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604932; c=relaxed/simple; bh=uXV98Zrpl4il+ECjXyEhMPhF7ON9sgsXksffGaRdVHA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UcfUTtqtti1On3fGohpNx2VZXmDHUZhOkFy5e3Xh/KZUIRZbulgMiSfEWjJwcCri0ytlrheeMTTPM7940CGd/7GZKCWY5Q7FOWlFm1QEg2bQ+bXChoDt48GVZeVAAnDURu6ZQBvbzklm3IEipZBST+mpmQcGq7w/fK9ewUTdzlI= 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=ko17DMo6; arc=none smtp.client-ip=209.85.218.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="ko17DMo6" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-acb2faa9f55so870769766b.3 for ; Wed, 07 May 2025 01:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1746604928; x=1747209728; 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=JdSfmOpjUf+n+Gt/wFek20I3+645i1PcH5llUxC+XYk=; b=ko17DMo6O+JSSVkFQO3Q0E+eIKhkfFGP/URYLW+dNHcqLVoH291C4djxftBeDjWJmj A8/5L7gZc6r/6/P5zYwjUAAf1TVd1TdRpHgXKt15I9stZ1X0wKYNkm8nXHVdC7ONDZ3Y zFpHFAG04ZIH52lEeK+iF2AnN6GuFPBv+xoRve+62/iLuZqNDvJwySGD/PumPWCSqFPA M6A8K6jhseTDOJn80AQhE9yvjnuDOSk6VtpU3ebQjirBjMq/CztibZTAmjWovWBoXdxs FPaQvWmPrarAHALQAYaVNlD7IPGRKoj9zkdErp/j1l0zZlOiqmZXYH0GhfcE2LNp1hfX AsxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746604928; x=1747209728; 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=JdSfmOpjUf+n+Gt/wFek20I3+645i1PcH5llUxC+XYk=; b=LqbtevZ8YFNn12AyC9DoATGuLvHxog2HlbiaSH30rjQL0UxKQFU7tNeHeONjjyk7ki 89YYofev/Qhz6cMQS5u/gZBmDySgfANNd1gqHLx7bo38ShIdcGS7H5hleDaYfOOm2DKy 9lBSlWBI503K2maM57essW7I03ddSAcA7l76gCnJXDB0cy5EOTwxzDRKW7uvwJT56/oE RJ8sBbe7df0DGPE5gCT0EGC+NpGspFrrG0Tn7VZkxQh1/r3IjoQlBazCP4sMgfx/TzCA 0aSLJCt7czE38hXFPrirFoyDaT/7JylKEHa6ObXdkENJ1jAjp2lix8mQCw7bRu9TxEm2 lrfA== X-Forwarded-Encrypted: i=1; AJvYcCVlvRq82ORwY05oenjUIIwTX7L18m1uDKJmdCQc69xVpa2LNAs29FyxgyOWhdV5+QBv7bi5QteH6RKXobnW@vger.kernel.org X-Gm-Message-State: AOJu0Yw+qHP/CMplS16mgcC7GpsccsGViFGAAe1j4NImn6+z+ADgTOZ7 nzI1Rl7zV4OTSL020+wxTTPqfo9YSYXgqfogbkNgQdS3FtoTuPJM2LrZtFJyLCA= X-Gm-Gg: ASbGnctbdy/7/Jj6FyXiHHjFOAvHr4hWclT/wWf69dti8i8Y2MWylsCMqARqRH12VHg jx3NEU27fclAFgotTIf9OxLRbsjg/kRwashLau7tFyFFK7jqsTZkW3G+ly7C1wuG5OYra77dEQe nmPIpxPcPbNn/MMA0JeVGzNqt476NFK3Z6IYecgbLGXcZqTOwrUzKadbg9yoe80ohwFgXs2M1i2 hWQuG+aAdW0n3p6BZRx3yKaVQZ5HDTetmRDa3oXPoUvMb26Yp8su0nRA7K6JvumtJrMSnNALA4L TxwbiIrkqf038an3p6+nIeRTryG/gDkUbwOhjGdWK98eyM2XtPNm7AfG0MiaFvFe7nDXNEdXYV7 RQNwmfdlSeSmg6w== X-Google-Smtp-Source: AGHT+IGAPRmQLx7xnwBq815f2zYCjZM2sBf1I1fFBdjt+vGkM/lX/FAon8S0MIUZj4B3CeheWCktWg== X-Received: by 2002:a17:907:6e94:b0:acb:5f9a:7303 with SMTP id a640c23a62f3a-ad1e8c93689mr249348866b.35.1746604928202; Wed, 07 May 2025 01:02:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 01:02:07 -0700 (PDT) From: Luca Weiss Date: Wed, 07 May 2025 10:01:40 +0200 Subject: [PATCH v4 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: <20250507-fp5-dp-sound-v4-4-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 , 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 2317fe285ee7d41689d7fac453164fbe706744ff..69c514fad0b1babafae4b61bb5ac944c6b4906dd 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 = "sm4250" }, { .compatible = "qcom,qrb5165-rb5-sndcard", .data = "sm8250" }, { .compatible = "qcom,sm8250-sndcard", .data = "sm8250" }, 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";