Merge "ARM: dts: msm: Add uncompressed bus nodes for CAMNOC" (7f9b7d86) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sdm845-bus.dtsi

+64 −6

Original line number	Diff line number	Diff line
		@@ -25,12 +25,14 @@
		<0x1380000 0x40000>,
		<0x1740000 0x40000>,
		<0x1620000 0x40000>,
		<0x1620000 0x40000>,
		<0x1620000 0x40000>;

		reg-names = "aggre1_noc-base", "aggre2_noc-base",
		"config_noc-base", "dc_noc-base",
		"gladiator_noc-base", "mc_virt-base", "mem_noc-base",
		"mmss_noc-base", "system_noc-base", "ipa_virt-base";
		"mmss_noc-base", "system_noc-base", "ipa_virt-base",
		"camnoc_virt-base";

		mbox-names = "apps_rsc", "disp_rsc";
		mboxes = <&apps_rsc 0 &disp_rsc 0>;
		@@ -368,6 +370,15 @@
		clocks = <>;
		};

		fab_camnoc_virt: fab-camnoc_virt {
		cell-id = <MSM_BUS_FAB_CAMNOC_VIRT>;
		label = "fab-camnoc_virt";
		qcom,fab-dev;
		qcom,base-name = "camnoc_virt-base";
		qcom,bypass-qos-prg;
		clocks = <>;
		};

		fab_config_noc: fab-config_noc {
		cell-id = <MSM_BUS_FAB_CONFIG_NOC>;
		label = "fab-config_noc";
		@@ -654,6 +665,33 @@
		qcom,bus-dev = <&fab_aggre2_noc>;
		};

		mas_qxm_camnoc_hf0_uncomp: mas-qxm-camnoc-hf0-uncomp {
		cell-id = <MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP>;
		label = "mas-qxm-camnoc-hf0-uncomp";
		qcom,buswidth = <32>;
		qcom,agg-ports = <1>;
		qcom,connections = <&slv_qns_camnoc_uncomp>;
		qcom,bus-dev = <&fab_camnoc_virt>;
		};

		mas_qxm_camnoc_hf1_uncomp: mas-qxm-camnoc-hf1-uncomp {
		cell-id = <MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP>;
		label = "mas-qxm-camnoc-hf1-uncomp";
		qcom,buswidth = <32>;
		qcom,agg-ports = <1>;
		qcom,connections = <&slv_qns_camnoc_uncomp>;
		qcom,bus-dev = <&fab_camnoc_virt>;
		};

		mas_qxm_camnoc_sf_uncomp: mas-qxm-camnoc-sf-uncomp {
		cell-id = <MSM_BUS_MASTER_CAMNOC_SF_UNCOMP>;
		label = "mas-qxm-camnoc-sf-uncomp";
		qcom,buswidth = <32>;
		qcom,agg-ports = <1>;
		qcom,connections = <&slv_qns_camnoc_uncomp>;
		qcom,bus-dev = <&fab_camnoc_virt>;
		};

		mas_qhm_spdm: mas-qhm-spdm {
		cell-id = <MSM_BUS_MASTER_SPDM>;
		label = "mas-qhm-spdm";
		@@ -900,12 +938,23 @@
		qcom,bus-dev = <&fab_mmss_noc>;
		};

		mas_qxm_camnoc_hf: mas-qxm-camnoc-hf {
		cell-id = <MSM_BUS_MASTER_CAMNOC_HF>;
		label = "mas-qxm-camnoc-hf";
		mas_qxm_camnoc_hf0: mas-qxm-camnoc-hf0 {
		cell-id = <MSM_BUS_MASTER_CAMNOC_HF0>;
		label = "mas-qxm-camnoc-hf0";
		qcom,buswidth = <32>;
		qcom,agg-ports = <2>;
		qcom,qport = <1 2>;
		qcom,agg-ports = <1>;
		qcom,qport = <1>;
		qcom,connections = <&slv_qns_mem_noc_hf>;
		qcom,bus-dev = <&fab_mmss_noc>;
		qcom,bcms = <&bcm_mm1>;
		};

		mas_qxm_camnoc_hf1: mas-qxm-camnoc-hf1 {
		cell-id = <MSM_BUS_MASTER_CAMNOC_HF1>;
		label = "mas-qxm-camnoc-hf1";
		qcom,buswidth = <32>;
		qcom,agg-ports = <1>;
		qcom,qport = <2>;
		qcom,connections = <&slv_qns_mem_noc_hf>;
		qcom,bus-dev = <&fab_mmss_noc>;
		qcom,bcms = <&bcm_mm1>;
		@@ -1193,6 +1242,15 @@
		qcom,bcms = <&bcm_sn11>;
		};

		slv_qns_camnoc_uncomp:slv-qns-camnoc-uncomp {
		cell-id = <MSM_BUS_SLAVE_CAMNOC_UNCOMP>;
		label = "slv-qns-camnoc-uncomp";
		qcom,buswidth = <32>;
		qcom,agg-ports = <1>;
		qcom,bus-dev = <&fab_camnoc_virt>;
		qcom,bcms = <&bcm_mm1>;
		};

		slv_qhs_a1_noc_cfg:slv-qhs-a1-noc-cfg {
		cell-id = <MSM_BUS_SLAVE_A1NOC_CFG>;
		label = "slv-qhs-a1-noc-cfg";

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+25 −25

Original line number	Diff line number	Diff line
		@@ -389,9 +389,9 @@
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;
		qcom,msm-bus,vectors-KBps =
		<MSM_BUS_MASTER_CAMNOC_HF
		<MSM_BUS_MASTER_CAMNOC_HF0
		MSM_BUS_SLAVE_EBI_CH0 0 0>,
		<MSM_BUS_MASTER_CAMNOC_HF
		<MSM_BUS_MASTER_CAMNOC_HF0
		MSM_BUS_SLAVE_EBI_CH0 0 0>;
		};
		qcom,axi-port-camnoc {
		@@ -400,10 +400,10 @@
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;
		qcom,msm-bus,vectors-KBps =
		<MSM_BUS_MASTER_CAMNOC_HF
		MSM_BUS_SLAVE_EBI_CH0 0 0>,
		<MSM_BUS_MASTER_CAMNOC_HF
		MSM_BUS_SLAVE_EBI_CH0 0 0>;
		<MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP
		MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>,
		<MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP
		MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>;
		};
		};
		qcom,axi-port2 {
		@@ -414,21 +414,21 @@
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;
		qcom,msm-bus,vectors-KBps =
		<MSM_BUS_MASTER_CAMNOC_HF
		<MSM_BUS_MASTER_CAMNOC_HF1
		MSM_BUS_SLAVE_EBI_CH0 0 0>,
		<MSM_BUS_MASTER_CAMNOC_HF
		<MSM_BUS_MASTER_CAMNOC_HF1
		MSM_BUS_SLAVE_EBI_CH0 0 0>;
		};
		qcom,axi-port-camnoc {
		qcom,msm-bus,name = "cam_hf_1_camnoc";
		qcom,msm-bus,name = "cam_hf_2_camnoc";
		qcom,msm-bus-vector-dyn-vote;
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;
		qcom,msm-bus,vectors-KBps =
		<MSM_BUS_MASTER_CAMNOC_HF
		MSM_BUS_SLAVE_EBI_CH0 0 0>,
		<MSM_BUS_MASTER_CAMNOC_HF
		MSM_BUS_SLAVE_EBI_CH0 0 0>;
		<MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP
		MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>,
		<MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP
		MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>;
		};
		};
		qcom,axi-port3 {
		@@ -450,10 +450,10 @@
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;
		qcom,msm-bus,vectors-KBps =
		<MSM_BUS_MASTER_CAMNOC_SF
		MSM_BUS_SLAVE_EBI_CH0 0 0>,
		<MSM_BUS_MASTER_CAMNOC_SF
		MSM_BUS_SLAVE_EBI_CH0 0 0>;
		<MSM_BUS_MASTER_CAMNOC_SF_UNCOMP
		MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>,
		<MSM_BUS_MASTER_CAMNOC_SF_UNCOMP
		MSM_BUS_SLAVE_CAMNOC_UNCOMP 0 0>;
		};
		};
		};

include/dt-bindings/msm/msm-bus-ids.h

+9 −3

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@
		#define MSM_BUS_FAB_MC_VIRT 6151
		#define MSM_BUS_FAB_MEM_NOC 6152
		#define MSM_BUS_FAB_IPA_VIRT 6153
		#define MSM_BUS_FAB_CAMNOC_VIRT 6154

		#define MSM_BUS_FAB_MC_VIRT_DISPLAY 26000
		#define MSM_BUS_FAB_MEM_NOC_DISPLAY 26001
		@@ -236,7 +237,7 @@
		#define MSM_BUS_MASTER_MNOC_SF_MEM_NOC 133
		#define MSM_BUS_MASTER_SNOC_GC_MEM_NOC 134
		#define MSM_BUS_MASTER_SNOC_SF_MEM_NOC 135
		#define MSM_BUS_MASTER_CAMNOC_HF 136
		#define MSM_BUS_MASTER_CAMNOC_HF0 136
		#define MSM_BUS_MASTER_CAMNOC_SF 137
		#define MSM_BUS_MASTER_VIDEO_PROC 138
		#define MSM_BUS_MASTER_GNOC_SNOC 139
		@@ -245,7 +246,11 @@
		#define MSM_BUS_MASTER_MEM_NOC_SNOC 142
		#define MSM_BUS_MASTER_IPA_CORE 143
		#define MSM_BUS_MASTER_ALC 144
		#define MSM_BUS_MASTER_MASTER_LAST 145
		#define MSM_BUS_MASTER_CAMNOC_HF1 145
		#define MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP 146
		#define MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP 147
		#define MSM_BUS_MASTER_CAMNOC_SF_UNCOMP 148
		#define MSM_BUS_MASTER_MASTER_LAST 149

		#define MSM_BUS_MASTER_LLCC_DISPLAY 20000
		#define MSM_BUS_MASTER_MNOC_HF_MEM_NOC_DISPLAY 20001
		@@ -584,7 +589,8 @@
		#define MSM_BUS_SLAVE_SNOC_MEM_NOC_SF 775
		#define MSM_BUS_SLAVE_MEM_NOC_SNOC 776
		#define MSM_BUS_SLAVE_IPA 777
		#define MSM_BUS_SLAVE_LAST 778
		#define MSM_BUS_SLAVE_CAMNOC_UNCOMP 778
		#define MSM_BUS_SLAVE_LAST 779

		#define MSM_BUS_SLAVE_EBI_CH0_DISPLAY 20512
		#define MSM_BUS_SLAVE_LLCC_DISPLAY 20513