ARM: dts: msm: Add vmrm resource id parameter

Add vmrm resource id parameter for vmrm driver, parameter definition
is memory label, memory tag, interrupt label.

CRs-Fixed: 3683770
Change-Id: I3715f7fa32ff4ba1fd402c8294a40220678f287f
Signed-off-by: zhuo <quic_zhuo@quicinc.com>

bindings/msm-cam-cci.txt

@@ -126,6 +126,12 @@ First Level Node - CCI device
   Value type: <phandle>
   Definition: should contain mmagic regulator used for mmagic clocks.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 =========================
 CCI clock settings
 =========================
@@ -201,6 +207,7 @@ Example:
 		pinctrl-1 = <&cci0_suspend>;
 		pinctrl-2 = <&cci1_active>;
 		pinctrl-3 = <&cci1_suspend>;
+		vmrm-resource-ids = <7 7 7>;
 		i2c_freq_100Khz: qcom,i2c_standard_mode {
 			 hw-thigh = <78>;
 			 hw-tlow = <114>;

bindings/msm-cam-cdm.txt

@@ -150,6 +150,12 @@ to CDM interface node.
   Value type: <empty>
   Definition: Flag to indicate whether this is non real time device.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 Example:
 	qcom,cpas-cdm0@ac48000 {
 		cell-index = <0>;
@@ -180,5 +186,6 @@ Example:
 		config-fifo;
 		fifo-depths = <64 0 0 0>;
 		single-context-cdm;
+		vmrm-resource-ids = <12 12 12>;
 		status = "ok";
 	};

bindings/msm-cam-cpas.txt

@@ -298,6 +298,12 @@ First Level Node - CAM CPAS device
               properties for those need to be included for this
               property to work.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 ===================================================================
 Third Level Node - CAMNOC Level nodes
 ===================================================================
@@ -521,6 +527,7 @@ Example:
 		rt-wr-lowstress-indicator-threshold = <0>;
 		rt-wr-bw-ratio-scale-factor = <1>;
 		enable-cam-drv;
+		vmrm-resource-ids = <10 10 10>;
 		camera-bus-nodes {
 			level3-nodes {
 				level-index = <3>;

bindings/msm-cam-csiphy.txt

@@ -139,6 +139,12 @@ First Level Node - CSIPHY device
   Value type: <u32>
   Definition: List of 0 or 1 values indicating whether shared clk or not.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 Example:
 
 cam_csiphy0: qcom,csiphy0@ace4000 {
@@ -171,5 +177,6 @@ cam_csiphy0: qcom,csiphy0@ace4000 {
 	clock-cntl-level = "nominal";
 	clock-rates =
 		<480000000 0 400000000 0>;
+	vmrm-resource-ids = <1 1 1>;
 	status = "ok";
 };

bindings/msm-cam-eeprom.txt

@@ -141,6 +141,12 @@ First Level Node - CAM EEPROM device
   Value type: <u32>
   Definition: List of clocks rates.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 Example:
 
 	eeprom0: qcom,eeprom@0 {
@@ -174,6 +180,7 @@ Example:
 		clock-names = "cam_clk";
 		clock-cntl-level = "turbo";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <32 32>;
 	};
 
 =======================================================

bindings/msm-cam-icp.txt

@@ -179,6 +179,12 @@ and name of firmware image.
   Value type: <empty>
   Definition: Flag to indicate whether this is non real time device.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 Examples:
 cam_a5: qcom,a5 {
 	cell-index = <0>;
@@ -258,6 +264,7 @@ cam_lx7: qcom,lx7 {
 	ubwc-ipe-write-cfg = <0x161ef 0x1620f>;
 	ubwc-bps-fetch-cfg = <0x707b 0x7083>;
 	ubwc-bps-write-cfg = <0x161ef 0x1620f>;
+	vmrm-resource-ids = <29 29 29>;
 	status = "ok";
 };
 
@@ -299,6 +306,7 @@ cam_ipe0: qcom,ipe0@ac42000 {
 	clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal",
 		"turbo";
 	nrt-device;
+	vmrm-resource-ids = <30 30 30>;
 	status = "ok";
 };
 
@@ -326,6 +334,7 @@ qcom,ipe1 {
 		<0 0 0 0 600000000>;
 	clock-cntl-level = "lowsvs", "svs",
 		"svs_l1", "nominal", "turbo";
+	vmrm-resource-ids = <31 31 31>;
 	nrt-device;
 };
 
@@ -363,5 +372,6 @@ cam_bps: qcom,bps@ac2c000 {
 	clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal",
 		"turbo";
 	nrt-device;
+	vmrm-resource-ids = <32 32 32>;
 	status = "ok";
 };

bindings/msm-cam-sfe.txt

@@ -101,6 +101,12 @@ Required properties:
   Value type: <string>
   Definition: Enable/Disable clk rate control.
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 Example:
 cam_sfe0: qcom,sfe0@ac9e000 {
 	cell-index = <0>;
@@ -133,5 +139,6 @@ cam_sfe0: qcom,sfe0@ac9e000 {
 	src-clock-name = "sfe_clk_src";
 	scl-clk-names = "sfe_0_ahb";
 	clock-control-debugfs = "true";
+	vmrm-resource-ids = <16 16 16>;
 	status = "ok";
 };

bindings/msm-cam-vfe.txt

@@ -132,6 +132,12 @@ Optional properties:
   Value type: <u32>
   Definition: HW unique Pid values
 
+- vmrm-resource-ids
+  Usage: optional
+  Value type: <u32>
+  Definition: should specify vmrm resource id list order is mem label,
+  mem tag, irq1 label, irq2 label.
+
 Example:
 cam_vfe0: qcom,ife0@ac62000 {
 	cell-index = <0>;
@@ -173,4 +179,5 @@ cam_vfe0: qcom,ife0@ac62000 {
 	ubwc-static-cfg = <0x1026 0x1036>;
 	cam_hw_pid = <16 28 20 8>;
 	status = "ok";
+	vmrm-resource-ids = <20 20 20>;
 };

pineapple-camera-sensor-cdp.dtsi

@@ -110,6 +110,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <32 32>;
 		status = "ok";
 	};
 
@@ -146,6 +147,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <33 33>;
 		status = "ok";
 	};
 
@@ -187,6 +189,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <34 34>;
 		status = "ok";
 	};
 
@@ -231,6 +234,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <35 35>;
 		status = "ok";
 	};
 
@@ -282,6 +286,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <36 36>;
 		status = "ok";
 	};
 
@@ -324,6 +329,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <37 37>;
 		status = "ok";
 	};
 
@@ -363,6 +369,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <38 38>;
 		status = "ok";
 	};
 
@@ -404,6 +411,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <39 39>;
 		status = "ok";
 	};
 };
@@ -460,6 +468,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <40 40>;
 		status = "ok";
 	};
 
@@ -496,6 +505,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <41 41>;
 		status = "ok";
 	};
 
@@ -542,6 +552,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <42 42>;
 		status = "ok";
 	};
 
@@ -591,6 +602,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <43 43>;
 		status = "ok";
 	};
 };
@@ -649,6 +661,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <44 44>;
 		status = "ok";
 	};
 
@@ -711,6 +724,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <45 45>;
 		status = "ok";
 	};
 
@@ -760,6 +774,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <46 46>;
 		status = "ok";
 	};
 };

pineapple-camera-sensor-mtp.dtsi

@@ -110,6 +110,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <32 32>;
 		status = "ok";
 	};
 
@@ -146,6 +147,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <33 33>;
 		status = "ok";
 	};
 
@@ -187,6 +189,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <34 34>;
 		status = "ok";
 	};
 
@@ -231,6 +234,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <35 35>;
 		status = "ok";
 	};
 
@@ -282,6 +286,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <36 36>;
 		status = "ok";
 	};
 
@@ -324,6 +329,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <37 37>;
 		status = "ok";
 	};
 
@@ -363,6 +369,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <38 38>;
 		status = "ok";
 	};
 
@@ -404,6 +411,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <39 39>;
 		status = "ok";
 	};
 };
@@ -460,6 +468,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <40 40>;
 		status = "ok";
 	};
 
@@ -496,6 +505,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <41 41>;
 		status = "ok";
 	};
 
@@ -542,6 +552,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <42 42>;
 		status = "ok";
 	};
 
@@ -591,6 +602,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <43 43>;
 		status = "ok";
 	};
 };
@@ -649,6 +661,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <44 44>;
 		status = "ok";
 	};
 
@@ -711,6 +724,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <45 45>;
 		status = "ok";
 	};
 
@@ -760,6 +774,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <46 46>;
 		status = "ok";
 	};
 };

pineapple-camera-sensor-qrd.dtsi

@@ -110,6 +110,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <32 32>;
 		status = "ok";
 	};
 
@@ -146,6 +147,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <33 33>;
 		status = "ok";
 	};
 
@@ -187,6 +189,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <34 34>;
 		status = "ok";
 	};
 
@@ -231,6 +234,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <35 35>;
 		status = "ok";
 	};
 
@@ -282,6 +286,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <36 36>;
 		status = "ok";
 	};
 
@@ -324,6 +329,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <37 37>;
 		status = "ok";
 	};
 
@@ -363,6 +369,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <38 38>;
 		status = "ok";
 	};
 
@@ -404,6 +411,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <39 39>;
 		status = "ok";
 	};
 };
@@ -460,6 +468,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <40 40>;
 		status = "ok";
 	};
 
@@ -496,6 +505,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <41 41>;
 		status = "ok";
 	};
 
@@ -542,6 +552,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <42 42>;
 		status = "ok";
 	};
 
@@ -591,6 +602,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <43 43>;
 		status = "ok";
 	};
 };
@@ -649,6 +661,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <44 44>;
 		status = "ok";
 	};
 
@@ -711,6 +724,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <45 45>;
 		status = "ok";
 	};
 
@@ -760,6 +774,7 @@
 		clock-names = "cam_clk";
 		clock-cntl-level = "nominal";
 		clock-rates = <24000000>;
+		vmrm-resource-ids = <46 46>;
 		status = "ok";
 	};
 };

pineapple-camera.dtsi

@@ -907,6 +907,7 @@
 		clock-rates =
 			<400000000 0 400000000 0>,
 			<480000000 0 400000000 0>;
+		vmrm-resource-ids = <1 1 1>;
 		status = "ok";
 	};
 
@@ -940,6 +941,7 @@
 		clock-rates =
 			<400000000 0 400000000 0>,
 			<480000000 0 400000000 0>;
+		vmrm-resource-ids = <2 2 2>;
 		status = "ok";
 	};
 
@@ -973,6 +975,7 @@
 		clock-rates =
 			<400000000 0 400000000 0>,
 			<480000000 0 400000000 0>;
+		vmrm-resource-ids = <3 3 3>;
 		status = "ok";
 	};
 
@@ -1006,6 +1009,7 @@
 		clock-rates =
 			<400000000 0 400000000 0>,
 			<480000000 0 400000000 0>;
+		vmrm-resource-ids = <4 4 4>;
 		status = "ok";
 	};
 
@@ -1039,6 +1043,7 @@
 		clock-rates =
 			<400000000 0 400000000 0>,
 			<480000000 0 400000000 0>;
+		vmrm-resource-ids = <5 5 5>;
 		status = "ok";
 	};
 
@@ -1072,6 +1077,7 @@
 		clock-rates =
 			<400000000 0 400000000 0>,
 			<480000000 0 400000000 0>;
+		vmrm-resource-ids = <6 6 6>;
 		status = "ok";
 	};
 
@@ -1100,6 +1106,7 @@
 		pinctrl-1 = <&cci_i2c_scl0_suspend &cci_i2c_sda0_suspend>;
 		pinctrl-2 = <&cci_i2c_scl1_active &cci_i2c_sda1_active>;
 		pinctrl-3 = <&cci_i2c_scl1_suspend &cci_i2c_sda1_suspend>;
+		vmrm-resource-ids = <7 7 7>;
 		status = "ok";
 
 		i2c_freq_100Khz_cci0: qcom,i2c_standard_mode {
@@ -1188,6 +1195,7 @@
 		pinctrl-1 = <&cci_i2c_scl2_suspend &cci_i2c_sda2_suspend>;
 		pinctrl-2 = <&cci_i2c_scl3_active &cci_i2c_sda3_active>;
 		pinctrl-3 = <&cci_i2c_scl3_suspend &cci_i2c_sda3_suspend>;
+		vmrm-resource-ids = <8 8 8>;
 		status = "ok";
 
 		i2c_freq_100Khz_cci1: qcom,i2c_standard_mode {
@@ -1276,6 +1284,7 @@
 		pinctrl-1 = <&cci_i2c_scl4_suspend &cci_i2c_sda4_suspend>;
 		pinctrl-2 = <&cci_i2c_scl5_active &cci_i2c_sda5_active>;
 		pinctrl-3 = <&cci_i2c_scl5_suspend &cci_i2c_sda5_suspend>;
+		vmrm-resource-ids = <9 9 9>;
 		status = "ok";
 
 		i2c_freq_100Khz_cci2: qcom,i2c_standard_mode {
@@ -1679,6 +1688,7 @@
 		rt-wr-highstress-indicator-threshold = <50>;
 		rt-wr-lowstress-indicator-threshold = <0>;
 		rt-wr-bw-ratio-scale-factor = <1>;
+		vmrm-resource-ids = <10 10 10>;
 		status = "ok";
 
 		camera-bus-nodes {
@@ -2515,6 +2525,7 @@
 		cam_hw_pid = <25>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <11 11 11>;
 		status = "ok";
 	};
 
@@ -2540,6 +2551,7 @@
 		cam_hw_pid = <26>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <12 12 12>;
 		status = "ok";
 	};
 
@@ -2565,6 +2577,7 @@
 		cam_hw_pid = <27>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <13 13 13>;
 		status = "ok";
 	};
 
@@ -2590,6 +2603,7 @@
 		cam_hw_pid = <24>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <14 14 14>;
 		status = "ok";
 	};
 
@@ -2615,6 +2629,7 @@
 		cam_hw_pid = <30>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <15 15 15>;
 		status = "ok";
 	};
 
@@ -2657,6 +2672,7 @@
 		src-clock-name = "sfe_0_clk_src";
 		cam_hw_pid = <11 0>;
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <16 16 16>;
 		status = "ok";
 	};
 
@@ -2693,6 +2709,7 @@
 		src-clock-name = "sfe_1_clk_src";
 		cam_hw_pid = <12 1>;
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <17 17 17>;
 		status = "ok";
 	};
 
@@ -2729,6 +2746,7 @@
 		src-clock-name = "sfe_2_clk_src";
 		cam_hw_pid = <13 2>;
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <18 18 18>;
 		status = "ok";
 	};
 
@@ -2763,6 +2781,7 @@
 			"turbo";
 		src-clock-name = "csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <19 19 19>;
 		status = "ok";
 	};
 
@@ -2801,6 +2820,7 @@
 		clock-control-debugfs = "true";
 		ubwc-static-cfg = <0x1026 0x1036>;
 		cam_hw_pid = <16 20 24 8>;
+		vmrm-resource-ids = <20 20 20>;
 		status = "ok";
 	};
 
@@ -2835,6 +2855,7 @@
 			"turbo";
 		src-clock-name = "csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <21 21 21>;
 		status = "ok";
 	};
 
@@ -2873,6 +2894,7 @@
 		clock-control-debugfs = "true";
 		ubwc-static-cfg = <0x1026 0x1036>;
 		cam_hw_pid = <17 21 25 9>;
+		vmrm-resource-ids = <22 22 22>;
 		status = "ok";
 	};
 
@@ -2907,6 +2929,7 @@
 			"turbo";
 		src-clock-name = "csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <23 23 23>;
 		status = "ok";
 	};
 
@@ -2945,6 +2968,7 @@
 		clock-control-debugfs = "true";
 		ubwc-static-cfg = <0x1026 0x1036>;
 		cam_hw_pid = <18 22 26 10>;
+		vmrm-resource-ids = <24 24 24>;
 		status = "ok";
 	};
 
@@ -2984,6 +3008,7 @@
 			"turbo";
 		src-clock-name = "ife_lite_csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <25 25 25>;
 		status = "ok";
 	};
 
@@ -3024,6 +3049,7 @@
 		src-clock-name = "ife_lite_clk_src";
 		clock-control-debugfs = "true";
 		cam_hw_pid = <27>;
+		vmrm-resource-ids = <26 26 26>;
 		status = "ok";
 	};
 
@@ -3063,6 +3089,7 @@
 			"turbo";
 		src-clock-name = "ife_lite_csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <27 27 27>;
 		status = "ok";
 	};
 
@@ -3103,6 +3130,7 @@
 		src-clock-name = "ife_lite_clk_src";
 		clock-control-debugfs = "true";
 		cam_hw_pid = <28>;
+		vmrm-resource-ids = <28 28 28>;
 		status = "ok";
 	};
 
@@ -3243,6 +3271,7 @@
 		ubwc-bps-write-cfg = <0x161ef 0x1620f>;
 		qos-val = <0x808>;
 		cam_hw_pid = <11>;
+		vmrm-resource-ids = <29 29 29>;
 		status = "ok";
 	};
 
@@ -3282,6 +3311,7 @@
 		src-clock-name = "ipe_nps_clk_src";
 		clock-control-debugfs = "true";
 		cam_hw_pid = <15 14 13 31>;
+		vmrm-resource-ids = <30 30 30>;
 		status = "ok";
 	};
 
@@ -3317,6 +3347,7 @@
 		src-clock-name = "bps_clk_src";
 		clock-control-debugfs = "true";
 		cam_hw_pid = <6 30>;
+		vmrm-resource-ids = <31 31 31>;
 		status = "ok";
 	};
 

trustedvm-pineapple-camera-sensor-cdp.dtsi

@@ -67,6 +67,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 			"CAM_RESET0";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <32 32>;
 		status = "ok";
 	};
 
@@ -87,6 +88,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 			"CAM_RESET1";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <33 33>;
 		status = "ok";
 	};
 
@@ -112,6 +114,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 			"CAM_RESET0";
 		cci-master = <0>;
+		vmrm-resource-ids = <34 34>;
 		status = "ok";
 	};
 
@@ -140,6 +143,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 			"CAM_RESET1";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <35 35>;
 		status = "ok";
 	};
 
@@ -170,6 +174,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 			"CAM_RESET3";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <36 36>;
 		status = "ok";
 	};
 
@@ -197,6 +202,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 			"CAM_RESET3";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <37 37>;
 		status = "ok";
 	};
 
@@ -220,6 +226,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK5",
 			"CAM_RESET5";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <38 38>;
 		status = "ok";
 	};
 
@@ -245,6 +252,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK5",
 			"CAM_RESET5";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <39 39>;
 		status = "ok";
 	};
 };

trustedvm-pineapple-camera-sensor-mtp.dtsi

@@ -67,6 +67,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 			"CAM_RESET0";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <32 32>;
 		status = "ok";
 	};
 
@@ -87,6 +88,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 			"CAM_RESET1";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <33 33>;
 		status = "ok";
 	};
 
@@ -112,6 +114,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 			"CAM_RESET0";
 		cci-master = <0>;
+		vmrm-resource-ids = <34 34>;
 		status = "ok";
 	};
 
@@ -140,6 +143,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 			"CAM_RESET1";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <35 35>;
 		status = "ok";
 	};
 
@@ -170,6 +174,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 			"CAM_RESET3";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <36 36>;
 		status = "ok";
 	};
 
@@ -197,6 +202,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 			"CAM_RESET3";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <37 37>;
 		status = "ok";
 	};
 
@@ -220,6 +226,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK5",
 			"CAM_RESET5";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <38 38>;
 		status = "ok";
 	};
 
@@ -245,6 +252,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK5",
 			"CAM_RESET5";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <39 39>;
 		status = "ok";
 	};
 };

trustedvm-pineapple-camera-sensor-qrd.dtsi

@@ -67,6 +67,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 			"CAM_RESET0";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <32 32>;
 		status = "ok";
 	};
 
@@ -87,6 +88,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 			"CAM_RESET1";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <33 33>;
 		status = "ok";
 	};
 
@@ -112,6 +114,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK0",
 			"CAM_RESET0";
 		cci-master = <0>;
+		vmrm-resource-ids = <34 34>;
 		status = "ok";
 	};
 
@@ -140,6 +143,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK1",
 			"CAM_RESET1";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <35 35>;
 		status = "ok";
 	};
 
@@ -170,6 +174,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 			"CAM_RESET3";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <36 36>;
 		status = "ok";
 	};
 
@@ -197,6 +202,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK3",
 			"CAM_RESET3";
 		cci-master = <CCI_MASTER_0>;
+		vmrm-resource-ids = <37 37>;
 		status = "ok";
 	};
 
@@ -220,6 +226,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK5",
 			"CAM_RESET5";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <38 38>;
 		status = "ok";
 	};
 
@@ -245,6 +252,7 @@
 		gpio-req-tbl-label = "CAMIF_MCLK5",
 			"CAM_RESET5";
 		cci-master = <CCI_MASTER_1>;
+		vmrm-resource-ids = <39 39>;
 		status = "ok";
 	};
 };

trustedvm-pineapple-camera.dtsi

@@ -889,6 +889,7 @@
 		interrupt-names = "CSIPHY0";
 		interrupts = <GIC_SPI 477 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9";
+		vmrm-resource-ids = <1 1 1>;
 		status = "ok";
 	};
 
@@ -901,6 +902,7 @@
 		interrupt-names = "CSIPHY1";
 		interrupts = <GIC_SPI 478 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9";
+		vmrm-resource-ids = <2 2 2>;
 		status = "ok";
 	};
 
@@ -913,6 +915,7 @@
 		interrupt-names = "CSIPHY2";
 		interrupts = <GIC_SPI 479 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9";
+		vmrm-resource-ids = <3 3 3>;
 		status = "ok";
 	};
 
@@ -925,6 +928,7 @@
 		interrupt-names = "CSIPHY3";
 		interrupts = <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9";
+		vmrm-resource-ids = <4 4 4>;
 		status = "ok";
 	};
 
@@ -937,6 +941,7 @@
 		interrupt-names = "CSIPHY4";
 		interrupts = <GIC_SPI 122 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9";
+		vmrm-resource-ids = <5 5 5>;
 		status = "ok";
 	};
 
@@ -949,6 +954,7 @@
 		interrupt-names = "CSIPHY5";
 		interrupts = <GIC_SPI 89 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdscr", "csi-vdd-1p2", "csi-vdd-0p9";
+		vmrm-resource-ids = <6 6 6>;
 		status = "ok";
 	};
 
@@ -969,6 +975,7 @@
 		pinctrl-1 = <&cci_i2c_scl0_suspend &cci_i2c_sda0_suspend>;
 		pinctrl-2 = <&cci_i2c_scl1_active &cci_i2c_sda1_active>;
 		pinctrl-3 = <&cci_i2c_scl1_suspend &cci_i2c_sda1_suspend>;
+		vmrm-resource-ids = <7 7 7>;
 		status = "ok";
 
 		i2c_freq_100Khz_cci0: qcom,i2c_standard_mode {
@@ -1049,6 +1056,7 @@
 		pinctrl-1 = <&cci_i2c_scl2_suspend &cci_i2c_sda2_suspend>;
 		pinctrl-2 = <&cci_i2c_scl3_active &cci_i2c_sda3_active>;
 		pinctrl-3 = <&cci_i2c_scl3_suspend &cci_i2c_sda3_suspend>;
+		vmrm-resource-ids = <8 8 8>;
 		status = "ok";
 
 		i2c_freq_100Khz_cci1: qcom,i2c_standard_mode {
@@ -1129,6 +1137,7 @@
 		pinctrl-1 = <&cci_i2c_scl4_suspend &cci_i2c_sda4_suspend>;
 		pinctrl-2 = <&cci_i2c_scl5_active &cci_i2c_sda5_active>;
 		pinctrl-3 = <&cci_i2c_scl5_suspend &cci_i2c_sda5_suspend>;
+		vmrm-resource-ids = <9 9 9>;
 		status = "ok";
 
 		i2c_freq_100Khz_cci2: qcom,i2c_standard_mode {
@@ -1409,6 +1418,7 @@
 		rt-wr-highstress-indicator-threshold = <50>;
 		rt-wr-lowstress-indicator-threshold = <0>;
 		rt-wr-bw-ratio-scale-factor = <1>;
+		vmrm-resource-ids = <10 10 10>;
 		status = "ok";
 
 		camera-bus-nodes {
@@ -2243,6 +2253,7 @@
 		cam_hw_pid = <25>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <11 11 11>;
 		status = "ok";
 	};
 
@@ -2263,6 +2274,7 @@
 		cam_hw_pid = <26>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <12 12 12>;
 		status = "ok";
 	};
 
@@ -2283,6 +2295,7 @@
 		cam_hw_pid = <27>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <13 13 13>;
 		status = "ok";
 	};
 
@@ -2303,6 +2316,7 @@
 		cam_hw_pid = <24>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <14 14 14>;
 		status = "ok";
 	};
 
@@ -2323,6 +2337,7 @@
 		cam_hw_pid = <30>;
 		cam-hw-mid = <0>;
 		single-context-cdm;
+		vmrm-resource-ids = <15 15 15>;
 		status = "ok";
 	};
 
@@ -2344,6 +2359,7 @@
 		regulator-names = "gdsc", "sfe0";
 		cam_hw_pid = <11 0>;
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <16 16 16>;
 		status = "ok";
 	};
 
@@ -2359,6 +2375,7 @@
 		regulator-names = "gdsc", "sfe1";
 		cam_hw_pid = <12 1>;
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <17 17 17>;
 		status = "ok";
 	};
 
@@ -2374,6 +2391,7 @@
 		regulator-names = "gdsc", "sfe2";
 		cam_hw_pid = <13 2>;
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <18 18 18>;
 		status = "ok";
 	};
 
@@ -2391,6 +2409,7 @@
 		regulator-names = "gdsc";
 		src-clock-name = "csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <19 19 19>;
 		status = "ok";
 	};
 
@@ -2407,6 +2426,7 @@
 		regulator-names = "gdsc", "ife0";
 		ubwc-static-cfg = <0x1026 0x1036>;
 		cam_hw_pid = <16 20 24 8>;
+		vmrm-resource-ids = <20 20 20>;
 		status = "ok";
 	};
 
@@ -2424,6 +2444,7 @@
 		regulator-names = "gdsc";
 		src-clock-name = "csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <21 21 21>;
 		status = "ok";
 	};
 
@@ -2440,6 +2461,7 @@
 		regulator-names = "gdsc", "ife1";
 		ubwc-static-cfg = <0x1026 0x1036>;
 		cam_hw_pid = <17 21 25 9>;
+		vmrm-resource-ids = <22 22 22>;
 		status = "ok";
 	};
 
@@ -2457,6 +2479,7 @@
 		regulator-names = "gdsc";
 		src-clock-name = "csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <23 23 23>;
 		status = "ok";
 	};
 
@@ -2473,6 +2496,7 @@
 		regulator-names = "gdsc", "ife2";
 		ubwc-static-cfg = <0x1026 0x1036>;
 		cam_hw_pid = <18 22 26 10>;
+		vmrm-resource-ids = <24 24 24>;
 		status = "ok";
 	};
 
@@ -2490,6 +2514,7 @@
 			"turbo";
 		src-clock-name = "ife_lite_csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <25 25 25>;
 		status = "ok";
 	};
 
@@ -2506,6 +2531,7 @@
 		src-clock-name = "ife_lite_clk_src";
 		clock-control-debugfs = "true";
 		cam_hw_pid = <27>;
+		vmrm-resource-ids = <26 26 26>;
 		status = "ok";
 	};
 
@@ -2523,6 +2549,7 @@
 			"turbo";
 		src-clock-name = "ife_lite_csid_clk_src";
 		clock-control-debugfs = "true";
+		vmrm-resource-ids = <27 27 27>;
 		status = "ok";
 	};
 
@@ -2539,6 +2566,7 @@
 		src-clock-name = "ife_lite_clk_src";
 		clock-control-debugfs = "true";
 		cam_hw_pid = <28>;
+		vmrm-resource-ids = <28 28 28>;
 		status = "ok";
 	};