Commit b5a12438 authored by Abel Vesa's avatar Abel Vesa Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sm8250: Use 2 interconnect cells 



Use two interconnect cells in order to optionally support a path tag.

Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230602062016.1883171-3-abel.vesa@linaro.org
parent c2998e9a

arch/arm64/boot/dts/qcom/sm8250.dtsi

+36 −36
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 0>;

			operating-points-v2 = <&cpu0_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_0: l2-cache {

				compatible = "cache";
@@ -137,8 +137,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 0>;

			operating-points-v2 = <&cpu0_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_100: l2-cache {

				compatible = "cache";
@@ -162,8 +162,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 0>;

			operating-points-v2 = <&cpu0_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_200: l2-cache {

				compatible = "cache";
@@ -187,8 +187,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 0>;

			operating-points-v2 = <&cpu0_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_300: l2-cache {

				compatible = "cache";
@@ -212,8 +212,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 1>;

			operating-points-v2 = <&cpu4_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_400: l2-cache {

				compatible = "cache";
@@ -237,8 +237,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 1>;

			operating-points-v2 = <&cpu4_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_500: l2-cache {

				compatible = "cache";
@@ -262,8 +262,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 1>;

			operating-points-v2 = <&cpu4_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_600: l2-cache {

				compatible = "cache";
@@ -287,8 +287,8 @@ 
			power-domain-names = "psci";

			qcom,freq-domain = <&cpufreq_hw 2>;

			operating-points-v2 = <&cpu7_opp_table>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,

					<&epss_l3 MASTER_OSM_L3_APPS &epss_l3 SLAVE_OSM_L3>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&epss_l3 MASTER_OSM_L3_APPS 0 &epss_l3 SLAVE_OSM_L3 0>;

			#cooling-cells = <2>;

			L2_700: l2-cache {

				compatible = "cache";
@@ -1789,49 +1789,49 @@ 
		config_noc: interconnect@1500000 {

			compatible = "qcom,sm8250-config-noc";

			reg = <0 0x01500000 0 0xa580>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		system_noc: interconnect@1620000 {

			compatible = "qcom,sm8250-system-noc";

			reg = <0 0x01620000 0 0x1c200>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		mc_virt: interconnect@163d000 {

			compatible = "qcom,sm8250-mc-virt";

			reg = <0 0x0163d000 0 0x1000>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		aggre1_noc: interconnect@16e0000 {

			compatible = "qcom,sm8250-aggre1-noc";

			reg = <0 0x016e0000 0 0x1f180>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		aggre2_noc: interconnect@1700000 {

			compatible = "qcom,sm8250-aggre2-noc";

			reg = <0 0x01700000 0 0x33000>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		compute_noc: interconnect@1733000 {

			compatible = "qcom,sm8250-compute-noc";

			reg = <0 0x01733000 0 0xa180>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		mmss_noc: interconnect@1740000 {

			compatible = "qcom,sm8250-mmss-noc";

			reg = <0 0x01740000 0 0x1f080>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};
@@ -2260,7 +2260,7 @@ 
				 <&apps_smmu 0x59f 0x0000>,

				 <&apps_smmu 0x586 0x0011>,

				 <&apps_smmu 0x596 0x0011>;

			interconnects = <&aggre2_noc MASTER_CRYPTO_CORE_0 &mc_virt SLAVE_EBI_CH0>;

			interconnects = <&aggre2_noc MASTER_CRYPTO_CORE_0 0 &mc_virt SLAVE_EBI_CH0 0>;

			interconnect-names = "memory";

		};
@@ -3693,21 +3693,21 @@ 
		dc_noc: interconnect@90c0000 {

			compatible = "qcom,sm8250-dc-noc";

			reg = <0 0x090c0000 0 0x4200>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		gem_noc: interconnect@9100000 {

			compatible = "qcom,sm8250-gem-noc";

			reg = <0 0x09100000 0 0xb4000>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};



		npu_noc: interconnect@9990000 {

			compatible = "qcom,sm8250-npu-noc";

			reg = <0 0x09990000 0 0x1600>;

			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

			qcom,bcm-voters = <&apps_bcm_voter>;

		};
@@ -3837,8 +3837,8 @@ 
				 <&videocc VIDEO_CC_MVS0_CLK>;

			clock-names = "iface", "core", "vcodec0_core";



			interconnects = <&gem_noc MASTER_AMPSS_M0 &config_noc SLAVE_VENUS_CFG>,

					<&mmss_noc MASTER_VIDEO_P0 &mc_virt SLAVE_EBI_CH0>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_VENUS_CFG 0>,

					<&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI_CH0 0>;

			interconnect-names = "cpu-cfg", "video-mem";



			iommus = <&apps_smmu 0x2100 0x0400>;
@@ -4122,10 +4122,10 @@ 
				 <&apps_smmu 0xc40 0x400>,

				 <&apps_smmu 0xc41 0x400>;



			interconnects = <&gem_noc MASTER_AMPSS_M0 &config_noc SLAVE_CAMERA_CFG>,

					<&mmss_noc MASTER_CAMNOC_HF &mc_virt SLAVE_EBI_CH0>,

					<&mmss_noc MASTER_CAMNOC_SF &mc_virt SLAVE_EBI_CH0>,

					<&mmss_noc MASTER_CAMNOC_ICP &mc_virt SLAVE_EBI_CH0>;

			interconnects = <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_CAMERA_CFG 0>,

					<&mmss_noc MASTER_CAMNOC_HF 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&mmss_noc MASTER_CAMNOC_SF 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&mmss_noc MASTER_CAMNOC_ICP 0 &mc_virt SLAVE_EBI_CH0 0>;

			interconnect-names = "cam_ahb",

					     "cam_hf_0_mnoc",

					     "cam_sf_0_mnoc",
@@ -4182,8 +4182,8 @@ 
			reg = <0 0x0ae00000 0 0x1000>;

			reg-names = "mdss";



			interconnects = <&mmss_noc MASTER_MDP_PORT0 &mc_virt SLAVE_EBI_CH0>,

					<&mmss_noc MASTER_MDP_PORT1 &mc_virt SLAVE_EBI_CH0>;

			interconnects = <&mmss_noc MASTER_MDP_PORT0 0 &mc_virt SLAVE_EBI_CH0 0>,

					<&mmss_noc MASTER_MDP_PORT1 0 &mc_virt SLAVE_EBI_CH0 0>;

			interconnect-names = "mdp0-mem", "mdp1-mem";



			power-domains = <&dispcc MDSS_GDSC>;
@@ -5671,7 +5671,7 @@ 
			clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>;

			clock-names = "xo", "alternate";



			#interconnect-cells = <1>;

			#interconnect-cells = <2>;

		};



		cpufreq_hw: cpufreq@18591000 {