From patchwork Wed Jan 18 01:18:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 13105390 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 773B8C38159 for ; Wed, 18 Jan 2023 01:21:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230123AbjARBV1 (ORCPT ); Tue, 17 Jan 2023 20:21:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbjARBVH (ORCPT ); Tue, 17 Jan 2023 20:21:07 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9427F26B7 for ; Tue, 17 Jan 2023 17:19:02 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id g23so19759238plq.12 for ; Tue, 17 Jan 2023 17:19:02 -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=yM0/ZgSXnPriP0s8Td7ncf1X5xesw5ro9ypu77r/PK0=; b=BV117Kzh2UJo/RZBiMP4OXZU4kXp8mdi48JKZJMLPFMihgNhZzPzqYbkUzLWDXY6Lb vAf8PqLlTxrCEba2lMkeotanIM/+dubx70HNK40Jd1vYL16+29poPIqIo6w0Ih6RcmFC UzNMr/URPmE2+wiXJ+R2ECli2yQmt5dzyAjUk= 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=yM0/ZgSXnPriP0s8Td7ncf1X5xesw5ro9ypu77r/PK0=; b=PRrpVW7iWy3Fvp62tzwIpIeRcS3t8VFgL/nR2BndWWgibR3qPTPxQVTYQKVnVuzvgo WBtShSIbNCFJnn/rp4JKuukDYKTuxTox81ZGnUjr+N4W6OyTFoSSXJobY9miAldij47Z XskdK02EvZkyJKpDUxxdNMpAmnX26UdOKts1nOumtUqWt4p9c1pA34xJUIuON6BNAKN8 nvKA1eiMGDXTxn4ObhfOhe4hqagsLfXtKFqtxNmsqXDBtEUUM4ZGP1IzVQMB70JIynxe 4td5G+elUKoc4aHbc5fHoMhc2sSjaTVqDRUvKQ74t63fhEJ4VgC2psoDLhZSFom3l9Yq GxYA== X-Gm-Message-State: AFqh2kpxnyAefyLnRvM1Cd20PyFzmAMfH9mTe+wAGTw4IVqykys9JOiR UyfBJqpU/D58qG8bJk0/P7DRvg== X-Google-Smtp-Source: AMrXdXvp8hy99LqbYoteOM90Am/eEo/HgHBQWWXXYRic5vTpFMq2hhBNwBimm+r/63GraZGxPXd1DA== X-Received: by 2002:a05:6a20:b925:b0:9d:efbf:8156 with SMTP id fe37-20020a056a20b92500b0009defbf8156mr28765714pzb.31.1674004742127; Tue, 17 Jan 2023 17:19:02 -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 b3-20020a63d803000000b00477bfac06b7sm18014600pgh.34.2023.01.17.17.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jan 2023 17:19:01 -0800 (PST) From: Judy Hsiao To: Andy Gross , Douglas Anderson , Matthias Kaehlcke Cc: Rob Herring , linux-arm-msm@vger.kernel.org, Bjorn Andersson , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Judy Hsiao , Konrad Dybcio , Krzysztof Kozlowski Subject: [PATCH v4] arm64: dts: qcom: sc7280: add DP audio to herobrine rt5682 1-mic dtsi Date: Wed, 18 Jan 2023 01:18:53 +0000 Message-Id: <20230118011853.1614566-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 v4: - Fix the subject. 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 */