ARM: zynq: dt: Move scuwdt out of board dtses

Move it to generic location.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Soren Brinkmann <soren.brinkmann@xilinx.com>

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 9dc3acbd9b5fe0c2b970339d84e9dfca826ab4fd..3aa70eaa09509e7a39daaf402eaabe3989450a7f 100644 (file)
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -299,5 +299,14 @@
                        reg = <0xf8f00600 0x20>;
                        clocks = <&clkc 4>;
                };
+
+               scuwatchdog: watchdog@f8f00620 {
+                       clocks = <&clkc 4>;
+                       compatible = "xlnx,ps7-scuwdt-1.00.a";
+                       device_type = "watchdog";
+                       interrupt-parent = <&intc>;
+                       interrupts = <1 14 0x301>;
+                       reg = <0xf8f00620 0xe0>;
+               };
        };
 };

diff --git a/arch/arm/boot/dts/zynq-afx-nand.dts b/arch/arm/boot/dts/zynq-afx-nand.dts
index 4f60bb7b3dda2947cd1f035ec387133f553f8e9f..b04cb641c3daff406e9c315bc9604e85134ffa2b 100644 (file)
--- a/arch/arm/boot/dts/zynq-afx-nand.dts
+++ b/arch/arm/boot/dts/zynq-afx-nand.dts
@@ -33,14 +33,6 @@
        };
 
        amba {
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_smcc_0: ps7-smcc@e000e000 {
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/zynq-afx-nor.dts b/arch/arm/boot/dts/zynq-afx-nor.dts
index 5c116338452420235f7cead2b9bd9971d5b7acb2..336e2415f58491d47d6fb062963f90ef634b0d50 100644 (file)
--- a/arch/arm/boot/dts/zynq-afx-nor.dts
+++ b/arch/arm/boot/dts/zynq-afx-nor.dts
@@ -33,14 +33,6 @@
        };
 
        amba {
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_smcc_0: ps7-smcc@e000e000 {
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 89683cbf0bab4fd6bcf896d726cf6985a77dd0bb..b26182a98adc94707132d96406a57fc20315fa53 100644 (file)
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -88,14 +88,6 @@
                        compatible = "xlnx,ps7-qspi-linear-1.00.a";
                        reg = <0xfc000000 0x1000000>;
                } ;
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_usb_0: ps7-usb@e0002000 {
                        clocks = <&clkc 28>;
                        compatible = "xlnx,ps7-usb-1.00.a", "xlnx,zynq-usb-1.00.a";

diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index adc9c71be7748b69fa5d7a9083229b03e4da0b5f..243fbac9c9aeb254180a36d197c4433971ffb0df 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -85,14 +85,6 @@
                        compatible = "xlnx,ps7-qspi-linear-1.00.a";
                        reg = <0xfc000000 0x1000000>;
                } ;
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_usb_0: ps7-usb@e0002000 {
                        clocks = <&clkc 28>;
                        compatible = "xlnx,ps7-usb-1.00.a", "xlnx,zynq-usb-1.00.a";

diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index a6040f98a1dae8f33eecb92ccc89832267ffd28b..f678ce6a0fcdadcb55ac348b46dc8852f9c26783 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -86,14 +86,6 @@
                        compatible = "xlnx,ps7-qspi-linear-1.00.a";
                        reg = <0xfc000000 0x2000000>;
                } ;
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_usb_0: ps7-usb@e0002000 {
                        clocks = <&clkc 28>;
                        compatible = "xlnx,ps7-usb-1.00.a", "xlnx,zynq-usb-1.00.a";

diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index f32355367c112c2ef13a71630a6921a57392def5..c4a737b21d9eaaa295a8b6f8aa46bd2d8480f23d 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -87,14 +87,6 @@
                        compatible = "xlnx,ps7-qspi-linear-1.00.a";
                        reg = <0xfc000000 0x1000000>;
                } ;
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_spi_1: ps7-spi@e0007000 {
                        clock-names = "ref_clk", "pclk";
                        clocks = <&clkc 26>, <&clkc 35>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index 8799a1d7633ac852f58b6bc33240156dd1a6c8b7..582130354b8e9a73c9eae6636c723ca1405f54da 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -35,14 +35,6 @@
        };
 
        amba {
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_smcc_0: ps7-smcc@e000e000 {
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index 9d14fae5d41f3c1002bb558b2a5675e14a0235e5..f144c82380f07e488958ff4e19400a2ff99f1d9f 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -36,14 +36,6 @@
        };
 
        amba {
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_smcc_0: ps7-smcc@e000e000 {
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 40edb466179a9a863e0bf1576e53ab1ad463f033..c816002f272d055bfdf5b7383f60370ee636a7bb 100644 (file)
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -87,14 +87,6 @@
                        compatible = "xlnx,ps7-qspi-linear-1.00.a";
                        reg = <0xfc000000 0x2000000>;
                } ;
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_spi_0: ps7-spi@e0006000 {
                        clock-names = "ref_clk", "pclk";
                        clocks = <&clkc 25>, <&clkc 34>;

diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 9937825763e18bbc25eb48d520ef20dd6ec71395..cb39093a0f55929f6c7541e5df3f56054f5a944e 100644 (file)
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -85,14 +85,6 @@
                        compatible = "xlnx,ps7-qspi-linear-1.00.a";
                        reg = <0xfc000000 0x1000000>;
                } ;
-               ps7_scuwdt_0: ps7-scuwdt@f8f00620 {
-                       clocks = <&clkc 4>;
-                       compatible = "xlnx,ps7-scuwdt-1.00.a";
-                       device_type = "watchdog";
-                       interrupt-parent = <&intc>;
-                       interrupts = <1 14 0x301>;
-                       reg = <0xf8f00620 0xe0>;
-               } ;
                ps7_usb_0: ps7-usb@e0002000 {
                        clocks = <&clkc 28>;
                        compatible = "xlnx,ps7-usb-1.00.a", "xlnx,zynq-usb-1.00.a";