From patchwork Tue Jan 17 02:42:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 13104120 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDBD7C67871 for ; Tue, 17 Jan 2023 02:50:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235791AbjAQCuH (ORCPT ); Mon, 16 Jan 2023 21:50:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235657AbjAQCtv (ORCPT ); Mon, 16 Jan 2023 21:49:51 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE3512DE43 for ; Mon, 16 Jan 2023 18:42:57 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id cx21-20020a17090afd9500b00228f2ecc6dbso7946414pjb.0 for ; Mon, 16 Jan 2023 18:42:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ci0ShutkyKqbRS5y4WPW5+YhID9YQTVWD129Yl/CGkY=; b=QjjequB+bplNYxUEtGQzwSjo9+VvYNN/XhKvzZM0XlamFEbJs90Tth5t1TD3XAzRJz JIvQGcRMwo0hwiH373b81nt6gPyhXwCWqvWLp2DM1FxT/KdKXTIdLWTaU8ICEMu7xpQd 5sceRvnB1/uFx94inIZAolVq0Pu95Ag3afa4A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ci0ShutkyKqbRS5y4WPW5+YhID9YQTVWD129Yl/CGkY=; b=EkK9/H7C5JNUF2HHAO3nwL3+m8parmEjSYAEPhFlzK7TzFo2+N+jgp6iC1eNRAmEgj S3sLTJRZ00Fc85xtJzAa1X9Z0bUQCMBLVEIbESdVaFyaIOy6OwdDvI3sNK5icxf0C0BY HYcJqm6v8Yw02fr5wD+btwsGeqYfpQqqV1VLxjJ9StfwBWEHO6W/UMxkAU5jOBTtzBgn TpK/4gIM4JgJhNXCGS8e1/s2HHTG0WqfE0muInJN5+VhVeKXNhLHj8zmvz7Reuo/RVvo pph/Lst/SnDw/EWAHUgTxvx6ijPEiPgzbPMxPheNINapiiydMX4jjWYDWpxrg506zuds 8B3g== X-Gm-Message-State: AFqh2koA5BY478pulJ4VfrjaJnoV6QGNP9Vnd8ddRQ8u4754ERl7I582 kPOmTev/ICItauLBTDj54zFbBUZ0xSiYv5DP X-Google-Smtp-Source: AMrXdXt9saMUMMymJC5GYhQSjizFrnpQID9HqmpQqPvwSrzjohq15SMwxJxf2Mno4CcOWYP9KWe9Dg== X-Received: by 2002:a17:902:7b85:b0:193:3bf7:40e6 with SMTP id w5-20020a1709027b8500b001933bf740e6mr735478pll.53.1673923364863; Mon, 16 Jan 2023 18:42:44 -0800 (PST) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id e2-20020a170902784200b0017d97d13b18sm19958534pln.65.2023.01.16.18.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 18:42:44 -0800 (PST) From: Judy Hsiao To: Andy Gross , Douglas Anderson , Matthias Kaehlcke Cc: linux-kernel@vger.kernel.org, Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson , Judy Hsiao , Konrad Dybcio , Krzysztof Kozlowski Subject: [PATCH v3] arm64: dts: qcom: sc7280: add display port audio Date: Tue, 17 Jan 2023 02:42:36 +0000 Message-Id: <20230117024236.1442437-1-judyhsiao@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 1. Add DisplayPort sound node and lpass_cpu node. 2. Adjust the dai-link order to make the order to be consistent with sc7280-herobrine-audio-rt5682-3mic.dtsi. Signed-off-by: Judy Hsiao Reviewed-by: Douglas Anderson --- Changes in v3: - Add more detail in the commit message. Changes in v2: - Fix the commit message format. .../qcom/sc7280-herobrine-audio-rt5682.dtsi | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi index af685bc35e10..69e7aa7b2f6c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi @@ -33,9 +33,22 @@ codec { }; dai-link@1 { - link-name = "ALC5682"; + link-name = "DisplayPort"; reg = <1>; + cpu { + sound-dai = <&lpass_cpu LPASS_DP_RX>; + }; + + codec { + sound-dai = <&mdss_dp>; + }; + }; + + dai-link@2 { + link-name = "ALC5682"; + reg = <2>; + cpu { sound-dai = <&lpass_cpu MI2S_PRIMARY>; }; @@ -92,6 +105,10 @@ dai-link@1 { reg = ; qcom,playback-sd-lines = <0>; }; + + dai-link@5 { + reg = ; + }; }; /* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */