From fb07ac88eb31146bdccdef28322eea2bb66a6a66 Mon Sep 17 00:00:00 2001
From: Patrick Daly <pdaly@quicinc.com>
Date: Tue, 29 Jun 2021 14:30:47 -0700
Subject: [PATCH] Revert "ARM: dts: msm: Remove vsmmu devicetree node for
 waipio-vm"

This reverts commit 723d9d87ea4e1a4b2d2a480f1a68794eddf644f2.
Latest builds have support for this feature.

Change-Id: Ie6511d937df977a24edd49c67fb9560e21196696
---
 qcom/msm-arm-smmu-waipio-vm.dtsi | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/qcom/msm-arm-smmu-waipio-vm.dtsi b/qcom/msm-arm-smmu-waipio-vm.dtsi
index 6e030b7d..4d79e094 100644
--- a/qcom/msm-arm-smmu-waipio-vm.dtsi
+++ b/qcom/msm-arm-smmu-waipio-vm.dtsi
@@ -1,8 +1,21 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
+/ {
+	vm-config {
+		vdevices {
+			vsmmu@15000000 {
+				vdevice-type = "vsmmu-v2";
+				smmu-handle = <0x15000000>;
+				num-cbs = <0x2>;
+				num-smrs = <0x3>;
+				patch = "/soc/apps-smmu@15000000";
+			};
+		};
+	};
+};
+
 &soc {
 	apps_smmu: apps-smmu@15000000 {
-		status = "disabled";
 		/*
 		 * reg, #global-interrupts & interrupts  properties will
 		 * be added dynamically by bootloader.