From b0650104bdfccbc8347b25210d7c4af2edff3046 Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Wed, 16 Sep 2020 16:25:10 +0530 Subject: [PATCH] ARM: dts: msm: Move the GMU kernel IOMMU phandle to the platform device Move the GMU kernel IOMMU handle to the top level GMU platform device to let it work with devlink and remove the currently unneeded gmu_user. Change-Id: Ib467fff76e459db1d0a5cf9e026e1bb61c5cbb54 --- qcom/shima-gpu.dtsi | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/qcom/shima-gpu.dtsi b/qcom/shima-gpu.dtsi index 18e0d559920e..d12f59be20d4 100644 --- a/qcom/shima-gpu.dtsi +++ b/qcom/shima-gpu.dtsi @@ -420,6 +420,9 @@ regulator-names = "vddcx", "vdd"; + iommus = <&kgsl_smmu 0x5 0x400>; + qcom,iommu-dma = "disabled"; + vddcx-supply = <&gpu_cx_gdsc>; vdd-supply = <&gpu_gx_gdsc>; @@ -436,18 +439,5 @@ mboxes = <&qmp_aop 0>; mbox-names = "aop"; - - gmu_user: gmu_user { - compatible = "qcom,smmu-gmu-user-cb"; - iommus = <&kgsl_smmu 0x4 0x400>; - qcom,iommu-dma = "disabled"; - }; - - gmu_kernel: gmu_kernel { - compatible = "qcom,smmu-gmu-kernel-cb"; - iommus = <&kgsl_smmu 0x5 0x400>; - qcom,iommu-dma = "disabled"; - }; - }; };