Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647bc0dc authored by Trishansh Bhardwaj's avatar Trishansh Bhardwaj Committed by Mukund Madhusudan Atre
Browse files

ARM: dts: msm: Add support for new BW voting in cpas DT node for lito 

Adding client to axi port mappings to cpas which support
new AXI voting for upcoming architectures. They require a
more granular approach to BW vote path info and detailed
view of how BW votes are consolidated.

Change-Id: Ic23c8bb17a22f0023bee84c4a652e3cb3f4ccaba
parent 8ad76a43

qcom/lito-camera.dtsi

+485 −66
Original line number Diff line number Diff line 
#include <dt-bindings/msm/msm-camera.h>



&soc {

	qcom,cam-req-mgr {

		compatible = "qcom,cam-req-mgr";
@@ -1106,61 +1108,64 @@ 
			"csiphy0", "csiphy1", "csiphy2", "csiphy3",

			"cci0", "cci1",

			"csid0", "csid1", "csid2",

			"iferdi0", "ifenrdi0", "iferdi1", "ifenrdi1",

			"iferdi2", "ifenrdi2",

			"ife0", "ife1", "ife2",

			"ipe0", "ipe1", "cam-cdm-intf0", "cpas-cdm0",

			"bps0", "icp0", "jpeg-dma0", "jpeg-enc0",

			"fd0", "lrmecpas0";

		client-axi-port-names =

			"cam_hf_0", "cam_hf_0", "cam_hf_0", "cam_hf_0",

			"cam_sf_0", "cam_sf_0",

			"cam_hf_0", "cam_hf_0", "cam_hf_0",

			"cam_hf_1", "cam_hf_0", "cam_hf_1", "cam_hf_0",

			"cam_hf_1", "cam_hf_0",

			"cam_sf_0", "cam_sf_0", "cam_sf_0", "cam_sf_0",

			"cam_sf_0", "cam_sf_1", "cam_sf_0", "cam_sf_0",

			"cam_sf_0", "cam_sf_0";

		qcom,axi-port-list {

			qcom,axi-port1 {

				/* this port is clubbed port of two ports

				 * (READ and PIX ports)

				 */

				qcom,axi-port-name = "cam_hf_0";

		camera-bus-nodes {

			level3-nodes {

				level-index = <3>;

				level3_rt0_wr_sum: level3-rt0-wr-sum {

					cell-index = <0>;

					node-name = "level3-rt0-wr-sum";

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					qcom,axi-port-name = "cam_hf_3";

					ib-bw-voting-needed;

					qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_hf_0_mnoc";

						qcom,msm-bus,name =

						"cam_hf_3_mnoc";

						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_HF0

						<MSM_BUS_MASTER_CAMNOC_HF1

						MSM_BUS_SLAVE_EBI_CH0 0 0>,

					<MSM_BUS_MASTER_CAMNOC_HF0

						<MSM_BUS_MASTER_CAMNOC_HF1

						MSM_BUS_SLAVE_EBI_CH0 0 0>;

					};

				};



			qcom,axi-port2 {

				/* this port is for rdi only WR*/

				level3_rt1_rd_wr_sum: level3-rt1-rd-wr-sum {

					cell-index = <1>;

					node-name = "level3-rt1-rd-wr-sum";

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					qcom,axi-port-name = "cam_hf_1";

					ib-bw-voting-needed;

					qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_hf_1_mnoc";

						qcom,msm-bus,name =

						"cam_hf_1_mnoc";

						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_HF1

						<MSM_BUS_MASTER_CAMNOC_HF0

						MSM_BUS_SLAVE_EBI_CH0 0 0>,

					<MSM_BUS_MASTER_CAMNOC_HF1

						<MSM_BUS_MASTER_CAMNOC_HF0

						MSM_BUS_SLAVE_EBI_CH0 0 0>;

					};

				};



			qcom,axi-port3 {

				level3_nrt0_rd_wr_sum: level3-nrt0-rd-wr-sum {

					cell-index = <2>;

					node-name = "level3-nrt0-rd-wr-sum";

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					qcom,axi-port-name = "cam_sf_0";

					qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_sf_0_mnoc";

						qcom,msm-bus,name =

						"cam_sf_0_mnoc";

						qcom,msm-bus-vector-dyn-vote;

						qcom,msm-bus,num-cases = <2>;

						qcom,msm-bus,num-paths = <1>;
@@ -1172,10 +1177,15 @@ 
					};

				};



			qcom,axi-port4 {

				qcom,axi-port-name = "cam_sf_1";

				level3_nrt1_rd_sum: level3-nrt1-rd-sum {

					cell-index = <3>;

					node-name = "level3-nrt1-rd-sum";

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					qcom,axi-port-name = "cam_sf_icp";

					qcom,axi-port-mnoc {

					qcom,msm-bus,name = "cam_sf_1_mnoc";

						qcom,msm-bus,name =

						"cam_hf_4_mnoc";

						qcom,msm-bus-vector-dyn-vote;

						qcom,msm-bus,num-cases = <2>;

						qcom,msm-bus,num-paths = <1>;
@@ -1187,5 +1197,414 @@ 
					};

				};

			};



			level2-nodes {

				level-index = <2>;

				camnoc-max-needed;

				level2_rt0_write0: level2-rt0-write0 {

					cell-index = <4>;

					node-name = "level2-rt0-write0";

					parent-node = <&level3_rt0_wr_sum>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level2_rt1_read0: level2-rt1-read0 {

					cell-index = <5>;

					node-name = "level2-rt1-read0";

					parent-node = <&level3_rt1_rd_wr_sum>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM_INTERLEAVE>;

				};



				level2_rt1_write0: level2-rt1-write0 {

					cell-index = <6>;

					node-name = "level2-rt1-write0";

					parent-node = <&level3_rt1_rd_wr_sum>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM_INTERLEAVE>;

				};



				level2_nrt0_write0: level2-nrt0-write0 {

					cell-index = <7>;

					node-name = "level2-nrt0-write0";

					parent-node = <&level3_nrt0_rd_wr_sum>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level2_nrt0_read0: level2-nrt0-read0 {

					cell-index = <8>;

					node-name = "level2-nrt0-read0";

					parent-node = <&level3_nrt0_rd_wr_sum>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level2_nrt1_read0: level2-nrt1-read0 {

					cell-index = <9>;

					node-name = "level2-nrt1-read0";

					parent-node = <&level3_nrt1_rd_sum>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					bus-width-factor = <4>;

				};

			};



			level1-nodes {

				level-index = <1>;

				camnoc-max-needed;

				level1_rt0_write0: level1-rt0-write0 {

					cell-index = <10>;

					node-name = "level1-rt0-write0";

					parent-node = <&level2_rt0_write0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level1_rt1_write0: level1-rt1-write0 {

					cell-index = <11>;

					node-name = "level1-rt1-write0";

					parent-node = <&level2_rt1_write0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level1_rt1_read0: level1-rt1-read0 {

					cell-index = <12>;

					node-name = "level1-rt1-read0";

					parent-node = <&level2_rt1_read0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level1_rt1_write1: level1-rt1-write1 {

					cell-index = <13>;

					node-name = "level1-rt1-write1";

					parent-node = <&level2_rt1_write0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level1_nrt0_write0: level1-nrt0-write0 {

					cell-index = <14>;

					node-name = "level1-nrt0-write0";

					parent-node = <&level2_nrt0_write0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level1_nrt0_write1: level1-nrt0-write1 {

					cell-index = <15>;

					node-name = "level1-nrt0-write1";

					parent-node = <&level2_nrt0_write0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};



				level1_nrt0_read0: level1-nrt0-read0 {

					cell-index = <16>;

					node-name = "level1-nrt0-read0";

					parent-node = <&level2_nrt0_read0>;

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

				};

			};



			level0-nodes {

				level-index = <0>;

				cpas_cdm0_all_rd: cpas-cdm0-all-rd {

					cell-index = <17>;

					node-name = "cpas-cdm0-all-rd";

					client-name = "cpas-cdm0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					parent-node = <&level2_nrt0_read0>;

				};



				fd0_all_wr: fd0-all-wr {

					cell-index = <18>;

					node-name = "fd0-all-wr";

					client-name = "fd0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					parent-node = <&level2_nrt0_write0>;

				};



				fd0_all_rd: fd0-all-rd {

					cell-index = <19>;

					node-name = "fd0-all-rd";

					client-name = "fd0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					parent-node = <&level2_nrt0_read0>;

				};



				ife0_pixelall_wr: ife0-pixelall-wr {

					cell-index = <20>;

					node-name = "ife0-pixelall-wr";

					client-name = "ife0";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_PIXEL_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_LINEAR

					CAM_CPAS_PATH_DATA_IFE_PDAF

					CAM_CPAS_PATH_DATA_IFE_VID

					CAM_CPAS_PATH_DATA_IFE_DISP

					CAM_CPAS_PATH_DATA_IFE_STATS

					CAM_CPAS_PATH_DATA_IFE_PIXEL_RAW>;

					parent-node = <&level1_rt1_write0>;

				};



				ife1_rdi_wr: ife1-rdi-wr {

					cell-index = <21>;

					node-name = "ife1-rdi-wr";

					client-name = "ife1";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1

					CAM_CPAS_PATH_DATA_IFE_RDI2

					CAM_CPAS_PATH_DATA_IFE_RDI3>;

					parent-node = <&level1_rt0_write0>;

				};



				ife0_rdi_wr: ife0-rdi-wr {

					cell-index = <22>;

					node-name = "ife0-rdi-wr";

					client-name = "ife0";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1

					CAM_CPAS_PATH_DATA_IFE_RDI2

					CAM_CPAS_PATH_DATA_IFE_RDI3>;

					parent-node = <&level1_rt0_write0>;

				};



				ife2_rdi_wr: ife2-rdi-wr {

					cell-index = <23>;

					node-name = "ife2-rdi-wr";

					client-name = "ife2";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1

					CAM_CPAS_PATH_DATA_IFE_RDI2

					CAM_CPAS_PATH_DATA_IFE_RDI3>;

					parent-node = <&level1_rt0_write0>;

				};



				ife1_rdi_rd: ife1-rdi-rd {

					cell-index = <24>;

					node-name = "ife1-rdi-rd";

					client-name = "ife1";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1

					CAM_CPAS_PATH_DATA_IFE_RDI2

					CAM_CPAS_PATH_DATA_IFE_RDI3>;

					parent-node = <&level1_rt1_read0>;

				};



				ife0_rdi_rd: ife0-rdi-rd {

					cell-index = <25>;

					node-name = "ife0-rdi-rd";

					client-name = "ife0";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1

					CAM_CPAS_PATH_DATA_IFE_RDI2

					CAM_CPAS_PATH_DATA_IFE_RDI3>;

					parent-node = <&level1_rt1_read0>;

				};



				ife1_pixelall_wr: ife1-pixelall-wr {

					cell-index = <26>;

					node-name = "ife1-pixelall-wr";

					client-name = "ife1";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_PIXEL_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_LINEAR

					CAM_CPAS_PATH_DATA_IFE_PDAF

					CAM_CPAS_PATH_DATA_IFE_VID

					CAM_CPAS_PATH_DATA_IFE_DISP

					CAM_CPAS_PATH_DATA_IFE_STATS

					CAM_CPAS_PATH_DATA_IFE_PIXEL_RAW>;

					parent-node = <&level1_rt1_write1>;

				};



				bps0_all_rd: bps0-all-rd {

					cell-index = <27>;

					node-name = "bps0-all-rd";

					client-name = "bps0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					parent-node = <&level1_nrt0_read0>;

				};



				ipe0_all_rd: ipe0-all-rd {

					cell-index = <28>;

					node-name = "ipe0-all-rd";

					client-name = "ipe0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IPE_RD_IN

					CAM_CPAS_PATH_DATA_IPE_RD_REF>;

					parent-node = <&level1_nrt0_read0>;

				};



				ipe1_all_rd: ipe1-all-rd {

					cell-index = <29>;

					node-name = "ipe1-all-rd";

					client-name = "ipe1";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IPE_RD_IN

					CAM_CPAS_PATH_DATA_IPE_RD_REF>;

					parent-node = <&level1_nrt0_read0>;

				};



				lrme0_all_rd: lrme0-all-rd {

					cell-index = <30>;

					node-name = "lrme0-all-rd";

					client-name = "lrmecpas0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					parent-node = <&level1_nrt0_read0>;

				};



				bps0_all_wr: bps0-all-wr {

					cell-index = <31>;

					node-name = "bps0-all-wr";

					client-name = "bps0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					parent-node = <&level1_nrt0_write0>;

				};



				ipe0_ref_wr: ipe0-ref-wr {

					cell-index = <32>;

					node-name = "ipe0-ref-wr";

					client-name = "ipe0";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IPE_WR_REF>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					parent-node = <&level1_nrt0_write0>;

				};



				ipe1_ref_wr: ipe1-ref-wr {

					cell-index = <33>;

					node-name = "ipe1-ref-wr";

					client-name = "ipe1";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IPE_WR_REF>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					parent-node = <&level1_nrt0_write0>;

				};



				lrme0_all_wr: lrme0-all-wr {

					cell-index = <34>;

					node-name = "lrme0-all-wr";

					client-name = "lrmecpas0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					parent-node = <&level1_nrt0_write0>;

				};



				ipe1_viddisp_wr: ipe1-viddisp-wr {

					cell-index = <35>;

					node-name = "ipe1-viddisp-wr";

					client-name = "ipe1";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IPE_WR_VID_DISP>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IPE_WR_VID

					CAM_CPAS_PATH_DATA_IPE_WR_DISP>;

					parent-node = <&level1_nrt0_write1>;

				};



				ipe0_viddisp_wr: ipe0-viddisp-wr {

					cell-index = <36>;

					node-name = "ipe0-viddisp-wr";

					client-name = "ipe0";

					traffic-data =

					<CAM_CPAS_PATH_DATA_IPE_WR_VID_DISP>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IPE_WR_VID

					CAM_CPAS_PATH_DATA_IPE_WR_DISP>;

					parent-node = <&level1_nrt0_write1>;

				};



				jpeg0_all_wr: jpeg0-all-wr {

					cell-index = <37>;

					node-name = "jpeg0-all-wr";

					client-name = "jpeg-enc0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_WRITE>;

					parent-node = <&level2_nrt0_write0>;

				};



				jpeg0_all_rd: jpeg0-all-rd {

					cell-index = <38>;

					node-name = "jpeg0-all-rd";

					client-name = "jpeg-enc0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					parent-node = <&level2_nrt0_read0>;

				};



				icp0_all_rd: icp0-all-rd {

					cell-index = <39>;

					node-name = "icp0-all-rd";

					client-name = "icp0";

					traffic-data = <CAM_CPAS_PATH_DATA_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					parent-node = <&level2_nrt1_read0>;

				};

			};

		};

	};

};