arm64: dts: socfpga: stratix10: move firmware out of soc node

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / altera / socfpga_stratix10.dtsi

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index 439497a..59075b9 100644 (file)
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -59,6 +59,25 @@
                };
        };
 
+       firmware {
+               svc {
+                       compatible = "intel,stratix10-svc";
+                       method = "smc";
+                       memory-region = <&service_reserved>;
+
+                       fpga_mgr: fpga-mgr {
+                               compatible = "intel,stratix10-soc-fpga-mgr";
+                       };
+               };
+       };
+
+       fpga-region {
+               compatible = "fpga-region";
+               #address-cells = <0x2>;
+               #size-cells = <0x2>;
+               fpga-mgr = <&fpga_mgr>;
+       };
+
        pmu {
                compatible = "arm,armv8-pmuv3";
                interrupts = <0 170 4>,
@@ -133,13 +152,6 @@
                interrupt-parent = <&intc>;
                ranges = <0 0 0 0xffffffff>;
 
-               base_fpga_region {
-                       #address-cells = <0x2>;
-                       #size-cells = <0x2>;
-                       compatible = "fpga-region";
-                       fpga-mgr = <&fpga_mgr>;
-               };
-
                clkmgr: clock-controller@ffd10000 {
                        compatible = "intel,stratix10-clkmgr";
                        reg = <0xffd10000 0x1000>;
@@ -510,6 +522,7 @@
                        resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>;
                        reset-names = "dwc2", "dwc2-ecc";
                        clocks = <&clkmgr STRATIX10_USB_CLK>;
+                       clock-names = "otg";
                        iommus = <&smmu 7>;
                        status = "disabled";
                };
@@ -620,18 +633,6 @@
 
                        status = "disabled";
                };
-
-               firmware {
-                       svc {
-                               compatible = "intel,stratix10-svc";
-                               method = "smc";
-                               memory-region = <&service_reserved>;
-
-                               fpga_mgr: fpga-mgr {
-                                       compatible = "intel,stratix10-soc-fpga-mgr";
-                               };
-                       };
-               };
        };
 
        usbphy0: usbphy0 {