From 20599ebcab1f0466e563b357165ef01748e4ce92 Mon Sep 17 00:00:00 2001 From: Niranjan Reddy Dumbala Date: Sat, 26 Oct 2024 05:29:04 -0700 Subject: [PATCH] Revert "ARM: dts: msm: Update tlmm-vm-gpio-list for parrot vm" This reverts commit 23f3921b9536736b468fe4d8554e8cf7c3b7e60e. Reason for revert: release branch hot fix Change-Id: I044ce99db921c62d3e2d3c33ed69da3e6a65ad8f Signed-off-by: Niranjan Reddy Dumbala --- qcom/parrot-pinctrl.dtsi | 9 --------- qcom/parrot-vm.dtsi | 7 ++++--- qcom/waipio-vm.dtsi | 6 ++---- 3 files changed, 6 insertions(+), 16 deletions(-) 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 {