diff --git a/qcom/parrot-pinctrl.dtsi b/qcom/parrot-pinctrl.dtsi
index b314a02f..28d57699 100644
--- a/qcom/parrot-pinctrl.dtsi
+++ b/qcom/parrot-pinctrl.dtsi
@@ -1887,13 +1887,4 @@
 		};
 	};
 
-	tlmm-vm-mem-access {
-		compatible = "qcom,tlmm-vm-mem-access";
-		qcom,master;
-		tuivm {
-			qcom,label = <0x08>;
-			qcom,vmid = <45>;
-			tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0>;
-		};
-	};
 };
diff --git a/qcom/parrot-vm.dtsi b/qcom/parrot-vm.dtsi
index 5ec070cb..82ea3d9d 100644
--- a/qcom/parrot-vm.dtsi
+++ b/qcom/parrot-vm.dtsi
@@ -53,13 +53,14 @@
 		<0x17260000 0x100000>;    /* GICR * 8 */
 	};
 
-	tlmm: pinctrl@f000000 {
+	pinctrl@f000000 {
 		compatible = "qcom,parrot-vm-tlmm";
-		gpios = /bits/ 16 <98 99>;
+		gpios = /bits/ 16 <>;
+		qcom,gpios-reserved = <0 1 2 3 38>;
 	};
 
 	tlmm-vm-mem-access {
-		tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0>;
+		tlmm-vm-gpio-list = <>;
 	};
 
 	apps-smmu@15000000 {
diff --git a/qcom/waipio-vm.dtsi b/qcom/waipio-vm.dtsi
index 80e2cdda..a34d5ec9 100644
--- a/qcom/waipio-vm.dtsi
+++ b/qcom/waipio-vm.dtsi
@@ -210,7 +210,7 @@
 				peer-default;
 				memory {
 					qcom,label = <0x8>;
-					qcom,mem-info-tag = <0x3>;
+					qcom,mem-info-tag = <0x2>;
 					allocate-base;
 				};
 			};
@@ -287,9 +287,7 @@
 
 	tlmm-vm-mem-access {
 		compatible = "qcom,tlmm-vm-mem-access";
-		tlmm-vm-gpio-list = <&tlmm 64 0 &tlmm 65 0 &tlmm 66 0 &tlmm 67 0 &tlmm 0 0
-				     &tlmm 4 0 &tlmm 86 0 &tlmm 87 0 &tlmm 16 0 &tlmm 17 0
-				     &tlmm 18 0 &tlmm 19 0 &tlmm 20 0 &tlmm 21 0>;
+		tlmm-vm-gpio-list = <365 366 367 368 301 305 387 388 317 318 319 320 321 322>;
 	};
 
 	vgic: interrupt-controller@17100000 {