From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C955C4320A for ; Wed, 11 Aug 2021 19:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEA0561008 for ; Wed, 11 Aug 2021 19:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231562AbhHKTrq (ORCPT ); Wed, 11 Aug 2021 15:47:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231154AbhHKTrp (ORCPT ); Wed, 11 Aug 2021 15:47:45 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F888C0613D3 for ; Wed, 11 Aug 2021 12:47:21 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id mq2-20020a17090b3802b0290178911d298bso6880082pjb.1 for ; Wed, 11 Aug 2021 12:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Cv8yz4ZGyAkZxwS8f4QmdO0fFGjnvFKh2Xd6lFbyeII=; b=IcIV9z5hF0qit4Ita+LUqPhfrtn/DHV1QTpywKFoARxxB/9aR4h2zH6Uz7GvqUDekX rCt3/0dt9WW3zGSLrEUQemTMaCshLvYUdWe408dek2PI3qgHyDfhyuTvYo+0TbtVjtBA vWNYtkFy3KQJ/rXPrKyxodMlY9TMuBcBSAp0U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Cv8yz4ZGyAkZxwS8f4QmdO0fFGjnvFKh2Xd6lFbyeII=; b=OzE+bKHllPc76AZe9jBUG303sSIQtTejYY+GmzONMfEe0bXF+RyabQyt01fkcjxBGq d8v/aGHfePlhFDNJJpEB4yvLezjesgBynEhSUo9LIdca9LMysXRG+p2xe6OqccXdtOe1 b+r9Oo4ozTfxYXQF/FTyeffcOcg1p7B3yNxIEAVXUmJ32muIRWXr/vK46jP58r9rRztl 0kDhAjutQP5S8srdmslffjJuRxSPpQeYv2TzogZEwHK6BtSEaV7n+HgMqg737eblIEUh kOSuNtBVwSIxgNAWlCaNy48elEvuMfBAVKehz60uEFzr4mMqDowwZu51NntLfMX4nQ4n nPVw== X-Gm-Message-State: AOAM531hgkFo479aNI95pCu8Ov8CwnOGDvKJXKJelD71x9KGsOxEyg9t 9QvVbUuNB37M7znlhDc3Mcaatw== X-Google-Smtp-Source: ABdhPJxq9RyP9XgWY+JGpZllJISpNNJaXeQGljYulmBIDBvXDVyeXlPXwfqADznH/wk/+Db4y8rrIQ== X-Received: by 2002:a65:5c84:: with SMTP id a4mr366515pgt.264.1628711241021; Wed, 11 Aug 2021 12:47:21 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:1c85:53f6:c893:55e8]) by smtp.gmail.com with ESMTPSA id w186sm365703pfw.78.2021.08.11.12.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:47:20 -0700 (PDT) From: Stephen Boyd To: Andy Gross , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, V Sujith Kumar Reddy , Srinivasa Rao Mandadapu , Srinivas Kandagatla Subject: [PATCH] arm64: dts: qcom: sc7180-trogdor: Fix lpass dai link for HDMI Date: Wed, 11 Aug 2021 12:47:19 -0700 Message-Id: <20210811194719.856593-1-swboyd@chromium.org> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This should be the dai for display port. Without this set properly we fail to get audio routed through external displays on trogdor. It looks like we picked up v4[1] of this patch when there was a v7[2]. The v7 patch still had the wrong sound-dai but at least we can fix all this up and audio works. Cc: V Sujith Kumar Reddy Cc: Srinivasa Rao Mandadapu Cc: Srinivas Kandagatla Fixes: b22d313e1772 ("arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI") Link: https://lore.kernel.org/r/20210721080549.28822-3-srivasam@qti.qualcomm.com [1] Link: https://lore.kernel.org/r/20210726120910.20335-3-srivasam@codeaurora.org [2] Signed-off-by: Stephen Boyd --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 0f2b3c00e434..aba0dcdf01da 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -301,11 +301,11 @@ sound_multimedia1_codec: codec { }; }; - dai-link@2 { + dai-link@5 { link-name = "MultiMedia2"; - reg = <2>; + reg = ; cpu { - sound-dai = <&lpass_cpu 2>; + sound-dai = <&lpass_cpu LPASS_DP_RX>; }; codec { @@ -782,7 +782,7 @@ secondary_mi2s: mi2s@1 { qcom,playback-sd-lines = <0>; }; - hdmi-primary@0 { + hdmi-primary@5 { reg = ; }; }; base-commit: 97ec669dfcfa22f8a595356ceb6ce46e7b4a82e9 -- https://chromeos.dev