arm64: zynqmp: Use reset header in zynqmp.dtsi
authorMichal Simek <michal.simek@xilinx.com>
Mon, 14 Oct 2019 13:55:53 +0000 (15:55 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 24 Oct 2019 11:37:02 +0000 (13:37 +0200)
Wire reset-controller and use macros from reset header.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/dts/zynqmp.dtsi

index dea918a0419a3ece89c1805ba5685db4056678e3..a498ff9af6235a7acbd57e25b738b70d3dce4e24 100644 (file)
@@ -12,6 +12,8 @@
  * the License, or (at your option) any later version.
  */
 
+#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
+
 / {
        compatible = "xlnx,zynqmp";
        #address-cells = <2>;
                                mboxes = <&ipi_mailbox_pmu1 0>, <&ipi_mailbox_pmu1 1>;
                                mbox-names = "tx", "rx";
                        };
+
+                       zynqmp_reset: reset-controller {
+                               compatible = "xlnx,zynqmp-reset";
+                               #reset-cells = <1>;
+                       };
                };
        };
 
                        reg-names = "serdes", "siou", "lpd";
                        nvmem-cells = <&soc_revision>;
                        nvmem-cell-names = "soc_revision";
-                       resets = <&rst 16>, <&rst 59>, <&rst 60>,
-                                <&rst 61>, <&rst 62>, <&rst 63>,
-                                <&rst 64>, <&rst 3>, <&rst 29>,
-                                <&rst 30>, <&rst 31>, <&rst 32>;
+                       resets = <&zynqmp_reset ZYNQMP_RESET_SATA>,
+                                <&zynqmp_reset ZYNQMP_RESET_USB0_CORERESET>,
+                                <&zynqmp_reset ZYNQMP_RESET_USB1_CORERESET>,
+                                <&zynqmp_reset ZYNQMP_RESET_USB0_HIBERRESET>,
+                                <&zynqmp_reset ZYNQMP_RESET_USB1_HIBERRESET>,
+                                <&zynqmp_reset ZYNQMP_RESET_USB0_APB>,
+                                <&zynqmp_reset ZYNQMP_RESET_USB1_APB>,
+                                <&zynqmp_reset ZYNQMP_RESET_DP>,
+                                <&zynqmp_reset ZYNQMP_RESET_GEM0>,
+                                <&zynqmp_reset ZYNQMP_RESET_GEM1>,
+                                <&zynqmp_reset ZYNQMP_RESET_GEM2>,
+                                <&zynqmp_reset ZYNQMP_RESET_GEM3>;
                        reset-names = "sata_rst", "usb0_crst", "usb1_crst",
                                      "usb0_hibrst", "usb1_hibrst", "usb0_apbrst",
                                      "usb1_apbrst", "dp_rst", "gem0_rst",