HSD#15014927993: dts: agilex5: Refactor smmu enablement for agilex5

Add iommu property for peripherals connected to TBU. Add smmu enablement in agilex5 dts.
altera-opensource · Mar 14, 2024 · 4c4221a · 4c4221a
1 parent 5c480af
commit 4c4221a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi
@@ -220,6 +220,7 @@
 			snps,rx-vlan-offload;
 			altr,sysmgr-syscon = <&sysmgr 0x44 0>;
 			altr,smtg-hub;
+			iommus = <&smmu 1>;
 
 			status = "disabled";
 
@@ -366,6 +367,7 @@
 			snps,rx-vlan-offload;
 			altr,sysmgr-syscon = <&sysmgr 0x48 0>;
 			altr,smtg-hub;
+			iommus = <&smmu 2>;
 
 			status = "disabled";
 
@@ -512,6 +514,7 @@
 			snps,rx-vlan-offload;
 			altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
 			altr,smtg-hub;
+			iommus = <&smmu 3>;
 
 			status = "disabled";
 
@@ -723,7 +726,7 @@
 			reset-names = "reset";
 			clocks = <&clkmgr AGILEX5_L4_MP_CLK>, <&clkmgr AGILEX5_SDMCLK>;
 			clock-names = "biu", "ciu";
-			/*iommus = <&smmu 5>;*/
+			iommus = <&smmu 5>;
 			status = "disabled";
 		};
 
@@ -737,6 +740,7 @@
 			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&clkmgr AGILEX5_NAND_NF_CLK>;
 			cdns,board-delay-ps = <4830>;
+			iommus = <&smmu 4>;
 			status = "disabled";
 		};
 
@@ -764,6 +768,7 @@
 			snps,priority = <0 1 2 3>;
 			snps,axi-max-burst-len = <8>;
 			snps,dma-40-bit-mask;
+			iommus = <&smmu 8>;
 			status = "okay";
 		};
 
@@ -783,6 +788,7 @@
 			snps,priority = <0 1 2 3>;
 			snps,axi-max-burst-len = <8>;
 			snps,dma-40-bit-mask;
+			iommus = <&smmu 9>;
 			status = "okay";
 		};
 
@@ -920,7 +926,7 @@
 			reset-names = "dwc2", "dwc2-ecc";
 			clocks = <&clkmgr AGILEX5_USB2OTG_HCLK>;
 			clock-names = "otg";
-			otg-rev = <0x0200>;
+			iommus = <&smmu 6>;
 			status = "disabled";
 		};
 
@@ -934,6 +940,7 @@
 				 <&clkmgr AGILEX5_USB31_BUS_CLK_EARLY>;
 			resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>;
 			reset-names = "dwc3", "dwc3-ecc";
+			iommus = <&smmu 7>;
 			status = "disabled";
 
 			usb@11000000{

diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dts b/arch/arm64/boot/dts/intel/socfpga_agilex5_socdk.dts
@@ -146,6 +146,10 @@
 	disable-over-current;
 };
 
+&smmu {
+	status = "okay";
+};
+
 &watchdog0 {
 	status = "okay";
 };