From nobody Sun Dec 14 07:59:21 2025 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 D40BEC00140 for ; Mon, 15 Aug 2022 18:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243758AbiHOShI (ORCPT ); Mon, 15 Aug 2022 14:37:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243787AbiHOSfq (ORCPT ); Mon, 15 Aug 2022 14:35:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 071C32CE2B; Mon, 15 Aug 2022 11:22:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9C354B80F99; Mon, 15 Aug 2022 18:22:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFC6FC43149; Mon, 15 Aug 2022 18:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660587758; bh=DFtHf9Vx/V4Ci2AIcFn+vfGjpCKmCPJC8oqDEtLSqq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I0qn6kLRqt7hM1rmaOT8dOTNUFlCIsL/mOU1OpVbpGPGY5awe44JNm/jPMvYKyX0T hqdEEFTJw0fBrfQn2Scus7Ufgx4fktdOw0bfor+v042Mqv42b83dXqFc3Jj7rDfoum jkAmkJYZriYQKOWAzaQOzZjsrh2oSGX1MUGdaPCU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marijn Suijten , Dmitry Baryshkov , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.15 184/779] arm64: dts: qcom: sdm630: fix gpus interconnect path Date: Mon, 15 Aug 2022 19:57:08 +0200 Message-Id: <20220815180345.132439453@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Dmitry Baryshkov [ Upstream commit 3cd1c4f41d64a40ea6bc4575ae28e37542123d77 ] ICC path for the GPU incorrectly states <&gnoc 1 &bimc 5>, which is a path from SLAVE_GNOC_BIMC to SLAVE_EBI. According to the downstream kernel sources, the GPU uses MASTER_OXILI here, which is equivalent to <&bimc 1 ...>. While we are at it, use defined names instead of the numbers for this interconnect path. Fixes: 5cf69dcbec8b ("arm64: dts: qcom: sdm630: Add Adreno 508 GPU configur= ation") Reported-by: Marijn Suijten Reviewed-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220521202708.1509308-8-dmitry.baryshkov@l= inaro.org Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qco= m/sdm630.dtsi index dca66b8c166c..952bb133914f 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1041,7 +1042,7 @@ adreno_gpu: gpu@5000000 { nvmem-cells =3D <&gpu_speed_bin>; nvmem-cell-names =3D "speed_bin"; =20 - interconnects =3D <&gnoc 1 &bimc 5>; + interconnects =3D <&bimc MASTER_OXILI &bimc SLAVE_EBI>; interconnect-names =3D "gfx-mem"; =20 operating-points-v2 =3D <&gpu_sdm630_opp_table>; --=20 2.35.1