From 7dba78d9314508a179afcf57843d29d96853facd Mon Sep 17 00:00:00 2001 From: Revanth Kumar Uppala Date: Thu, 9 Feb 2023 05:50:20 +0000 Subject: [PATCH] nvethernet: Move nvidia,vm-irq-config to overlay Move nvidia,vm-irq-config to overlay from Base DT to overlay DT Bug 3956724 Change-Id: Ib6c8f1af7aa5ccb6de8c19c1ae721d2ccd79f01e Signed-off-by: Revanth Kumar Uppala Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/soc/t23x-generic-dts/+/2855643 Reviewed-by: Bhadram Varka Reviewed-by: Laxman Dewangan Reviewed-by: Narayan Reddy Reviewed-by: svcacv GVS: Gerrit_Virtual_Submit --- overlay/tegra234-soc-overlay.dtsi | 35 +++++++++++++++++++++++++++++++ tegra234.dtsi | 30 -------------------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/overlay/tegra234-soc-overlay.dtsi b/overlay/tegra234-soc-overlay.dtsi index 73b498d..a96816a 100644 --- a/overlay/tegra234-soc-overlay.dtsi +++ b/overlay/tegra234-soc-overlay.dtsi @@ -564,6 +564,7 @@ interconnect-names = "dma-mem", "write"; iommus = <&smmu_niso0 TEGRA234_SID_MGBE>; power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEB>; + nvidia,vm-irq-config = <&mgbe_vm_irq_config>; nvidia,num-dma-chans = <10>; nvidia,dma-chans = <0 1 2 3 4 5 6 7 8 9>; nvidia,num-mtl-queues = <10>; @@ -995,6 +996,40 @@ fragment-t234@2 { target-path = "/"; __overlay__ { + mgbe_vm_irq_config: mgbe-vm-irq-config { + nvidia,num-vm-irqs = <5>; + vm_irq1 { + nvidia,num-vm-channels = <2>; + nvidia,vm-channels = <0 1>; + nvidia,vm-num = <0>; + nvidia,vm-irq-id = <0>; + }; + vm_irq2 { + nvidia,num-vm-channels = <2>; + nvidia,vm-channels = <2 3>; + nvidia,vm-num = <1>; + nvidia,vm-irq-id = <1>; + }; + vm_irq3 { + nvidia,num-vm-channels = <2>; + nvidia,vm-channels = <4 5>; + nvidia,vm-num = <2>; + nvidia,vm-irq-id = <2>; + }; + vm_irq4 { + nvidia,num-vm-channels = <2>; + nvidia,vm-channels = <6 7>; + nvidia,vm-num = <3>; + nvidia,vm-irq-id = <3>; + }; + vm_irq5 { + nvidia,num-vm-channels = <2>; + nvidia,vm-channels = <8 9>; + nvidia,vm-num = <4>; + nvidia,vm-irq-id = <4>; + }; + }; + aliases { serial1 = "/bus@0/serial@3110000"; i2c0 = "/bus@0/i2c@3160000"; diff --git a/tegra234.dtsi b/tegra234.dtsi index 6dc5fbc..5218308 100644 --- a/tegra234.dtsi +++ b/tegra234.dtsi @@ -998,7 +998,6 @@ interconnect-names = "dma-mem", "write"; iommus = <&smmu_niso0 TEGRA234_SID_MGBE>; power-domains = <&bpmp TEGRA234_POWER_DOMAIN_MGBEA>; - nvidia,vm-irq-config = <&mgbe_vm_irq_config>; status = "disabled"; }; @@ -1104,35 +1103,6 @@ status = "disabled"; }; - mgbe_vm_irq_config: mgbe-vm-irq-config { - nvidia,num-vm-irqs = <5>; - vm_irq1 { - nvidia,num-vm-channels = <2>; - nvidia,vm-channels = <0 1>; - nvidia,vm-num = <0>; - }; - vm_irq2 { - nvidia,num-vm-channels = <2>; - nvidia,vm-channels = <2 3>; - nvidia,vm-num = <1>; - }; - vm_irq3 { - nvidia,num-vm-channels = <2>; - nvidia,vm-channels = <4 5>; - nvidia,vm-num = <2>; - }; - vm_irq4 { - nvidia,num-vm-channels = <2>; - nvidia,vm-channels = <6 7>; - nvidia,vm-num = <3>; - }; - vm_irq5 { - nvidia,num-vm-channels = <2>; - nvidia,vm-channels = <8 9>; - nvidia,vm-num = <4>; - }; - }; - smmu_niso1: iommu@8000000 { compatible = "nvidia,tegra234-smmu", "nvidia,smmu-500"; reg = <0x8000000 0x1000000>,