From patchwork Sat May 14 14:10:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 572628 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 7BF52C433F5 for ; Sat, 14 May 2022 14:11:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232466AbiENOLW (ORCPT ); Sat, 14 May 2022 10:11:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232970AbiENOKw (ORCPT ); Sat, 14 May 2022 10:10:52 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4D3D15713 for ; Sat, 14 May 2022 07:10:50 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id j4so18925155lfh.8 for ; Sat, 14 May 2022 07:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vAKzbIo4hRjweGPYwmYctILBgK8ro78wB6S5h8puzVU=; b=sOzCUR6V98rqT7GY+XYtG9PyE3u4k5Hqtjemu8W6GaDAS6jsLgerdUYvJy50sY4JHF aqdZbvLH9DjdHU9Hh6XrczSOz9YGNZ13XstZM8GTbjCNTJs2QlQyCJL95kYPZCOvrqi6 WERJ/1xs6wFz8UKX+CUbN/y63aREU6CoJbYKmR9s/h0oHuWT6bJTcl8Pt7MN6ohaEvjp +ZsprPfgZN6dPEEU9ZPceYEc+GMZ5SKx88iab2EIGiPW8ei+DXz5M7i0a6jdC1EoRLYX z0UqS2qQ6R3pgpk/YC/cAbETyoa/bpGhdkAsnf2tGZnxaSSMzS89PAYnCNn489jtHxs3 20EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vAKzbIo4hRjweGPYwmYctILBgK8ro78wB6S5h8puzVU=; b=XPEb4EN/I0p3CrIgv77Tj1qgw2TjrLim8shVU2btwC3iAJ/337pgD8Eu7LX5tK7W7v rouUA8/eNFpoiKuaZd4FZKYX7/e7Z8EYnsEml8jQ82LqubVuzIwJs2dC5E1WoctP3FC4 MVSpY465XWA2G2dav3b4RKfx7lzlwkPA773M0O2yEpiDBtWdO3kx4rSAGLDB2Pt38JM9 Slf8J0xGIWONojX6uLzJJKtWNRL1MIHLFDk5YrNS+lx6pk2hKcdeZ/Kdv75bsbD9m8mx JOqLndL2zkTmvM73wd5otHW1J2AFdCq3qFfGlTwf6c+uV5uMApiLh3PoeNlXwsKSEoF3 M1eQ== X-Gm-Message-State: AOAM530ufl7yCqmPwvf3jhnc+LEJRUjsugNOHd0gYHLTJ59Qa9ohlMx8 67VAv+GoNNkheZGgRG14GxVIYg== X-Google-Smtp-Source: ABdhPJzYF4uRWhQ+XRmyrgNwFS5IbmNsiuCp414tMvuttj6/n7nvxSr+SMGtSvNpzelN14umWqxF5g== X-Received: by 2002:a05:6512:3b2b:b0:473:a42b:faa4 with SMTP id f43-20020a0565123b2b00b00473a42bfaa4mr6785574lfv.292.1652537449017; Sat, 14 May 2022 07:10:49 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id x9-20020a05651c104900b0024f3d1daedasm845912ljm.98.2022.05.14.07.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 07:10:48 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Konrad Dybcio , Marijn Suijten Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 08/12] arm64: dts: qcom: sdm630: use defined symbols for interconnects Date: Sat, 14 May 2022 17:10:37 +0300 Message-Id: <20220514141041.3158521-9-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220514141041.3158521-1-dmitry.baryshkov@linaro.org> References: <20220514141041.3158521-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Replace numeric values with the symbolic names defined in the bindings header. Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 6d0bc9e8fb5b..44f048934fc6 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 @@ -1045,7 +1046,7 @@ adreno_gpu: gpu@5000000 { nvmem-cells = <&gpu_speed_bin>; nvmem-cell-names = "speed_bin"; - interconnects = <&bimc 1 &bimc 5>; + interconnects = <&bimc MASTER_OXILI &bimc SLAVE_EBI>; interconnect-names = "gfx-mem"; operating-points-v2 = <&gpu_sdm630_opp_table>; @@ -1299,8 +1300,8 @@ sdhc_2: sdhci@c084000 { <&xo_board>; clock-names = "core", "iface", "xo"; - interconnects = <&a2noc 3 &a2noc 10>, - <&gnoc 0 &cnoc 28>; + interconnects = <&a2noc MASTER_SDCC_2 &a2noc SLAVE_A2NOC_SNOC>, + <&gnoc MASTER_APSS_PROC &cnoc SLAVE_SDCC_2>; operating-points-v2 = <&sdhc2_opp_table>; pinctrl-names = "default", "sleep"; @@ -1351,8 +1352,8 @@ sdhc_1: sdhci@c0c4000 { <&gcc GCC_SDCC1_ICE_CORE_CLK>; clock-names = "core", "iface", "xo", "ice"; - interconnects = <&a2noc 2 &a2noc 10>, - <&gnoc 0 &cnoc 27>; + interconnects = <&a2noc MASTER_SDCC_1 &a2noc SLAVE_A2NOC_SNOC>, + <&gnoc MASTER_APSS_PROC &cnoc SLAVE_SDCC_1>; interconnect-names = "sdhc1-ddr", "cpu-sdhc1"; operating-points-v2 = <&sdhc1_opp_table>; pinctrl-names = "default", "sleep"; @@ -1525,9 +1526,9 @@ mdp: mdp@c901000 { "core", "vsync"; - interconnects = <&mnoc 2 &bimc 5>, - <&mnoc 3 &bimc 5>, - <&gnoc 0 &mnoc 17>; + interconnects = <&mnoc MASTER_MDP_P0 &bimc SLAVE_EBI>, + <&mnoc MASTER_MDP_P1 &bimc SLAVE_EBI>, + <&gnoc MASTER_APSS_PROC &mnoc SLAVE_DISPLAY_CFG>; interconnect-names = "mdp0-mem", "mdp1-mem", "rotator-mem"; @@ -2034,7 +2035,7 @@ camss: camss@ca00000 { "cphy_csid1", "cphy_csid2", "cphy_csid3"; - interconnects = <&mnoc 5 &bimc 5>; + interconnects = <&mnoc MASTER_VFE &bimc SLAVE_EBI>; interconnect-names = "vfe-mem"; iommus = <&mmss_smmu 0xc00>, <&mmss_smmu 0xc01>, @@ -2097,8 +2098,8 @@ venus: video-codec@cc00000 { <&mmcc VIDEO_AXI_CLK>, <&mmcc THROTTLE_VIDEO_AXI_CLK>; clock-names = "core", "iface", "bus", "bus_throttle"; - interconnects = <&gnoc 0 &mnoc 13>, - <&mnoc 4 &bimc 5>; + interconnects = <&gnoc MASTER_APSS_PROC &mnoc SLAVE_VENUS_CFG>, + <&mnoc MASTER_VENUS &bimc SLAVE_EBI>; interconnect-names = "cpu-cfg", "video-mem"; interrupts = ; iommus = <&mmss_smmu 0x400>,