From patchwork Thu May 12 23:43:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 571899 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 6D11FC433FE for ; Thu, 12 May 2022 23:44:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359665AbiELXoO (ORCPT ); Thu, 12 May 2022 19:44:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359627AbiELXoM (ORCPT ); Thu, 12 May 2022 19:44:12 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F05D28AB96 for ; Thu, 12 May 2022 16:43:56 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id p26so11699494lfh.10 for ; Thu, 12 May 2022 16:43:56 -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=TX2EPeQO4iv5kbvdeC41BclBBjF3SbJIVPgRNnipG6Q=; b=a9SmNueSSZCkNsG/ToamfNrk9zGwnTAPiZrPJqT/AVMy79LQkGLV91KEqNTy4Ym7mb WdEd5GhFiLkxMvIu6f3UUgIhw90TIwhIdCwVIgJUp+p2DJ5q+EzcK4tfAQvlzhAJNp2G nrFWN2y/Bo0y0BD6UmCCxk8g/GrPlcvavB5l3I+wpTrq2XThwVr2IYGQn7h1ENcGemh3 GMih1W8oyIs4xLk8UnE8M+mK77sTn7y1T0a8d8Q7rhITvk8WwzEBGqHXV6bfsrGFX3LR Pa57tgEGNF7aMSA9HwzvthFvnkP2ni6y1Ux10spbIr21pGbyO7rMVZHIRa9PG7rSGeoM RmQA== 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=TX2EPeQO4iv5kbvdeC41BclBBjF3SbJIVPgRNnipG6Q=; b=YRSfSynA73pjOTwBEHoqsNd/aQS5b1JMFaqNYw3KLfwvojZlXj2bxm7I1QN+NTo83Y Mt+/VGXROQgvTyVw6Id6okiplIqV70EtogR2JUg0J6fLCV+xC25XL7x5vqncCcF7Khau WbZRWMtyTJrQlcjsr/rr3zSPcf+nJkJXfQehyp1zbKEMtODJw/pkf7GDMR0pQppQnysL AHGJ4Dg14mSuf84TesuMmAYt97hLZaOVTQzXfTbgGEVYQF/o0q5xMBH1JEbTQQCSP0zg 0qiupCzoY2u53an1PQrtWoYzeosPGF3/hyv69uzKhGiCblF31OHls0Z6cRok/ho4Bwg/ 9fcg== X-Gm-Message-State: AOAM530irWlJyOjaI+/VAHolneaqgpgEmjcR75P59pVhqQ5SVqK/Vu9w QVvCkicKJ+Vlzyz8DIrZo97y4Q== X-Google-Smtp-Source: ABdhPJxbuvP+hMTOUkhB6/pZvgvrVgq6e1ZE6WYJCW5BPSyOupJT4itWTa+FNocIic02w6oAdJF1JQ== X-Received: by 2002:a05:6512:3f5:b0:472:30ed:e983 with SMTP id n21-20020a05651203f500b0047230ede983mr1464662lfq.495.1652399034424; Thu, 12 May 2022 16:43:54 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id u10-20020ac248aa000000b0047255d211b8sm129976lfg.231.2022.05.12.16.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 16:43:54 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [RESEND v2 6/8] arm64: dts: qcom: sdm630: use defined symbols for interconnects Date: Fri, 13 May 2022 02:43:47 +0300 Message-Id: <20220512234349.2673724-7-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220512234349.2673724-1-dmitry.baryshkov@linaro.org> References: <20220512234349.2673724-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 17a1877587cf..01a1a1703568 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 = <&gnoc 1 &bimc 5>; + interconnects = <&gnoc MASTER_APSS_PROC &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>,