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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 3C560C4338F for ; Wed, 11 Aug 2021 04:38:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23B8260F35 for ; Wed, 11 Aug 2021 04:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234162AbhHKEig (ORCPT ); Wed, 11 Aug 2021 00:38:36 -0400 Received: from mail-0301.mail-europe.com ([188.165.51.139]:43283 "EHLO mail-0301.mail-europe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233988AbhHKEid (ORCPT ); Wed, 11 Aug 2021 00:38:33 -0400 Date: Wed, 11 Aug 2021 04:37:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1628656682; bh=OCiFQZnCOnUGcGj+ycOgpUC4rhDlZ6RCMWuzNwlouAM=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=RVVc+eOGNmArjtdkPGpgCUcte3lrsKJdhPNaM/V3WoG/cmBt4Nh9/JuEJaLgs0/Ja 9aTZXjh1fH4UDo28X6cbjJXyF3J3BFSMEQ2GYJZZqRFODttDmiJ9Gnnx3KKYqpvAU3 EAf/2PMQh/EJl0dzfq8iCTXiboORnxon1soDVav8= To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring From: Yassine Oudjana Cc: Yassine Oudjana , AngeloGioacchino Del Regno , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Reply-To: Yassine Oudjana Subject: [PATCH v3 6/6] arm64: dts: qcom: msm8996: Add interconnect support Message-ID: <20210811043451.189776-7-y.oudjana@protonmail.com> In-Reply-To: <20210811043451.189776-1-y.oudjana@protonmail.com> References: <20210811043451.189776-1-y.oudjana@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add interconnect providers for the multiple NoCs available on the platform, and assign interconnects used by some blocks. Signed-off-by: Yassine Oudjana --- Changes since v2: - Remove interconnect paths from CPUs since cpufreq driver doesn't support= icc scaling yet. arch/arm64/boot/dts/qcom/msm8996.dtsi | 80 +++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qc= om/msm8996.dtsi index 78c55ca10ba9..64637b15ff14 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -7,6 +7,7 @@ #include #include #include +#include #include #include =20 @@ -683,6 +684,15 @@ gcc: clock-controller@300000 { =09=09=09clock-names =3D "cxo2"; =09=09}; =20 +=09=09bimc: interconnect@408000 { +=09=09=09compatible =3D "qcom,msm8996-bimc"; +=09=09=09reg =3D <0x00408000 0x5a000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_BIMC_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_BIMC_A_CLK>; +=09=09}; + =09=09tsens0: thermal-sensor@4a9000 { =09=09=09compatible =3D "qcom,msm8996-tsens", "qcom,tsens-v2"; =09=09=09reg =3D <0x004a9000 0x1000>, /* TM */ @@ -705,6 +715,61 @@ tsens1: thermal-sensor@4ad000 { =09=09=09#thermal-sensor-cells =3D <1>; =09=09}; =20 +=09=09cnoc: interconnect@500000 { +=09=09=09compatible =3D "qcom,msm8996-cnoc"; +=09=09=09reg =3D <0x00500000 0x1000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_CNOC_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_CNOC_A_CLK>; +=09=09}; + +=09=09snoc: interconnect@524000 { +=09=09=09compatible =3D "qcom,msm8996-snoc"; +=09=09=09reg =3D <0x00524000 0x1c000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_SNOC_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_SNOC_A_CLK>; +=09=09}; + +=09=09a1noc: interconnect@562000 { +=09=09=09compatible =3D "qcom,msm8996-a1noc"; +=09=09=09reg =3D <0x00562000 0x5000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_AGGR1_NOC_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_AGGR1_NOC_A_CLK>; +=09=09}; + +=09=09a2noc: interconnect@583000 { +=09=09=09compatible =3D "qcom,msm8996-a2noc"; +=09=09=09reg =3D <0x00583000 0x7000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_AGGR2_NOC_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>; +=09=09}; + +=09=09mnoc: interconnect@5a4000 { +=09=09=09compatible =3D "qcom,msm8996-mnoc"; +=09=09=09reg =3D <0x005a4000 0x1c000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a", "iface"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_MMAXI_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_MMAXI_A_CLK>, +=09=09=09=09 <&mmcc AHB_CLK_SRC>; +=09=09}; + +=09=09pnoc: interconnect@5c0000 { +=09=09=09compatible =3D "qcom,msm8996-pnoc"; +=09=09=09reg =3D <0x005c0000 0x3000>; +=09=09=09#interconnect-cells =3D <1>; +=09=09=09clock-names =3D "bus", "bus_a"; +=09=09=09clocks =3D <&rpmcc RPM_SMD_PCNOC_CLK>, +=09=09=09=09 <&rpmcc RPM_SMD_PCNOC_A_CLK>; +=09=09}; + =09=09tcsr_mutex_regs: syscon@740000 { =09=09=09compatible =3D "syscon"; =09=09=09reg =3D <0x00740000 0x40000>; @@ -784,6 +849,11 @@ mdp: mdp@901000 { =09=09=09=09assigned-clock-rates =3D <300000000>, =09=09=09=09=09 <19200000>; =20 +=09=09=09=09interconnects =3D <&mnoc MASTER_MDP_PORT0 &bimc SLAVE_EBI_CH0>= , +=09=09=09=09=09=09<&mnoc MASTER_MDP_PORT1 &bimc SLAVE_EBI_CH0>, +=09=09=09=09=09=09<&mnoc MASTER_ROTATOR &bimc SLAVE_EBI_CH0>; +=09=09=09=09interconnect-names =3D "mdp0-mem", "mdp1-mem", "rotator-mem"; + =09=09=09=09ports { =09=09=09=09=09#address-cells =3D <1>; =09=09=09=09=09#size-cells =3D <0>; @@ -955,6 +1025,9 @@ gpu: gpu@b00000 { =09=09=09=09"mem", =09=09=09=09"mem_iface"; =20 +=09=09=09interconnects =3D <&bimc MASTER_GRAPHICS_3D &bimc SLAVE_EBI_CH0>; +=09=09=09interconnect-names =3D "gfx-mem"; + =09=09=09power-domains =3D <&mmcc GPU_GX_GDSC>; =09=09=09iommus =3D <&adreno_smmu 0>; =20 @@ -1947,6 +2020,9 @@ venus: video-codec@c00000 { =09=09=09=09 <&mmcc VIDEO_AXI_CLK>, =09=09=09=09 <&mmcc VIDEO_MAXI_CLK>; =09=09=09clock-names =3D "core", "iface", "bus", "mbus"; +=09=09=09interconnects =3D <&mnoc MASTER_VIDEO_P0 &bimc SLAVE_EBI_CH0>, +=09=09=09=09=09<&bimc MASTER_AMPSS_M0 &mnoc SLAVE_VENUS_CFG>; +=09=09=09interconnect-names =3D "video-mem", "cpu-cfg"; =09=09=09iommus =3D <&venus_smmu 0x00>, =09=09=09=09 <&venus_smmu 0x01>, =09=09=09=09 <&venus_smmu 0x0a>, @@ -2563,6 +2639,10 @@ usb3: usb@6af8800 { =09=09=09=09=09 <&gcc GCC_USB30_MASTER_CLK>; =09=09=09assigned-clock-rates =3D <19200000>, <120000000>; =20 +=09=09=09interconnects =3D <&a2noc MASTER_USB3 &bimc SLAVE_EBI_CH0>, +=09=09=09=09=09<&bimc MASTER_AMPSS_M0 &snoc SLAVE_USB3>; +=09=09=09interconnect-names =3D "usb-ddr", "apps-usb"; + =09=09=09power-domains =3D <&gcc USB30_GDSC>; =09=09=09status =3D "disabled"; =20 --=20 2.32.0