]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
zynq: DTS synchronization with device tree BSP
authorMichal Simek <michal.simek@xilinx.com>
Mon, 14 Oct 2013 08:09:32 +0000 (10:09 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 18 Oct 2013 17:47:29 +0000 (19:47 +0200)
All DTSes generated byt device tree BSP 14.7.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/boot/dts/zynq-7000.dtsi
arch/arm/boot/dts/zynq-afx-nand.dts
arch/arm/boot/dts/zynq-afx-nor.dts
arch/arm/boot/dts/zynq-zc702.dts
arch/arm/boot/dts/zynq-zc706.dts
arch/arm/boot/dts/zynq-zc770-xm010.dts
arch/arm/boot/dts/zynq-zc770-xm011.dts
arch/arm/boot/dts/zynq-zc770-xm012.dts
arch/arm/boot/dts/zynq-zc770-xm013.dts
arch/arm/boot/dts/zynq-zed.dts

index 401c1262d4ed2224a16f1ef377f451c162500450..14fb2e609babcc881deeff1c59ea8d39090ff90f 100644 (file)
 / {
        compatible = "xlnx,zynq-7000";
 
+       pmu {
+               compatible = "arm,cortex-a9-pmu";
+               interrupts = <0 5 4>, <0 6 4>;
+               interrupt-parent = <&intc>;
+               reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
+       };
+
        amba {
                compatible = "simple-bus";
                #address-cells = <1>;
                        compatible = "xlnx,xuartps";
                        reg = <0xE0000000 0x1000>;
                        interrupts = <0 27 4>;
-                       clock = <50000000>;
+                       clocks = <&uart_clk 0>;
                };
 
                uart1: uart@e0001000 {
                        compatible = "xlnx,xuartps";
                        reg = <0xE0001000 0x1000>;
                        interrupts = <0 50 4>;
-                       clock = <50000000>;
+                       clocks = <&uart_clk 1>;
                };
 
                slcr: slcr@f8000000 {
                };
 
                ttc0: ttc0@f8001000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "xlnx,ttc";
+                       interrupt-parent = <&intc>;
+                       interrupts = < 0 10 4 0 11 4 0 12 4 >;
+                       compatible = "cdns,ttc";
                        reg = <0xF8001000 0x1000>;
                        clocks = <&cpu_clk 3>;
                        clock-names = "cpu_1x";
                        clock-ranges;
-
-                       ttc0_0: ttc0.0 {
-                               status = "disabled";
-                               reg = <0>;
-                               interrupts = <0 10 4>;
-                       };
-                       ttc0_1: ttc0.1 {
-                               status = "disabled";
-                               reg = <1>;
-                               interrupts = <0 11 4>;
-                       };
-                       ttc0_2: ttc0.2 {
-                               status = "disabled";
-                               reg = <2>;
-                               interrupts = <0 12 4>;
-                       };
                };
 
                ttc1: ttc1@f8002000 {
-                       #interrupt-parent = <&intc>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "xlnx,ttc";
+                       interrupt-parent = <&intc>;
+                       interrupts = < 0 37 4 0 38 4 0 39 4 >;
+                       compatible = "cdns,ttc";
                        reg = <0xF8002000 0x1000>;
                        clocks = <&cpu_clk 3>;
                        clock-names = "cpu_1x";
                        clock-ranges;
-
-                       ttc1_0: ttc1.0 {
-                               status = "disabled";
-                               reg = <0>;
-                               interrupts = <0 37 4>;
-                       };
-                       ttc1_1: ttc1.1 {
-                               status = "disabled";
-                               reg = <1>;
-                               interrupts = <0 38 4>;
-                       };
-                       ttc1_2: ttc1.2 {
-                               status = "disabled";
-                               reg = <2>;
-                               interrupts = <0 39 4>;
-                       };
                };
+               scutimer: scutimer@f8f00600 {
+                       interrupt-parent = <&intc>;
+                       interrupts = < 1 13 0x301 >;
+                       compatible = "arm,cortex-a9-twd-timer";
+                       reg = < 0xf8f00600 0x20 >;
+                       clocks = <&cpu_clk 1>;
+               } ;
        };
 };
index a514f497de68080d12603e56a4fcba34810faf3e..668a18114dcae3ef20a94c5b2ddde8ab8879dae2 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -68,6 +56,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                ps7_ttc_1: ps7-ttc@f8002000 {
                        clocks = <&clkc 6>;
                        compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc";
+                       interrupt-names = "ttc0", "ttc1", "ttc2";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 37 4>, <0 38 4>, <0 39 4>;
                        reg = <0xf8002000 0x1000>;
index 60349446d60a5536a90fb1b736b095c1b5d8755c..cf8f8b117e163b5bd607c1a34a135970c4665bdc 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -68,6 +56,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                ps7_ttc_1: ps7-ttc@f8002000 {
                        clocks = <&clkc 6>;
                        compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc";
+                       interrupt-names = "ttc0", "ttc1", "ttc2";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 37 4>, <0 38 4>, <0 39 4>;
                        reg = <0xf8002000 0x1000>;
index 87b82727c9997100a866e78514fbb814c2174bd3..9e79a4fe02e17af441d3d0421802869c0c5cf7f6 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -71,6 +59,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                ps7_can_0: ps7-can@e0008000 {
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 19>, <&clkc 36>;
-                       compatible = "xlnx,ps7-can-1.00.a";
+                       compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 28 4>;
                        reg = <0xe0008000 0x1000>;
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                        clock-frequency = <50000000>;
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 21>, <&clkc 32>;
-                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci";
+                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci", "arasan,sdhci";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 24 4>;
                        reg = <0xe0100000 0x1000>;
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = "MIO 7";
+                       usb-reset = <&ps7_gpio_0 7 0>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;
index 7f87c33e342e0a1348a083fbb47946c9f1fd149a..496e673bdcde6a7695b2567ab657e66389e297dd 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -71,6 +59,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                        reg = <4>;
-                                       rtc@54 {
+                                       rtc@51 {
                                                compatible = "nxp,pcf8563";
                                                reg = <0x51>;
                                        };
                                };
+
+
+                               i2c@7 {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       reg = <7>;
+                                       ucd90120@65 {
+                                               compatible = "pmbus,ucd90120";
+                                               reg = <0x65>;
+                                       };
+                               };
                        };
 
                } ;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                        clock-frequency = <50000000>;
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 21>, <&clkc 32>;
-                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci";
+                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci", "arasan,sdhci";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 24 4>;
                        reg = <0xe0100000 0x1000>;
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                ps7_ttc_1: ps7-ttc@f8002000 {
                        clocks = <&clkc 6>;
                        compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc";
+                       interrupt-names = "ttc0", "ttc1", "ttc2";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 37 4>, <0 38 4>, <0 39 4>;
                        reg = <0xf8002000 0x1000>;
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = "MIO 7";
+                       usb-reset = <&ps7_gpio_0 7 0>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;
index d8031e9af97191c75e2e16963d206be45f5c8270..c467c0ea5ad9ff9599e219407d78740ffc7162ed 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -72,6 +60,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                ps7_can_0: ps7-can@e0008000 {
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 19>, <&clkc 36>;
-                       compatible = "xlnx,ps7-can-1.00.a";
+                       compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 28 4>;
                        reg = <0xe0008000 0x1000>;
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                        clock-frequency = <50000000>;
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 21>, <&clkc 32>;
-                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci";
+                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci", "arasan,sdhci";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 24 4>;
                        reg = <0xe0100000 0x1000>;
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = "MIO 7";
+                       usb-reset = <&ps7_gpio_0 7 0>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;
index 4c3ec0fe8e7a769a28f246f2dab2284efd2bd33d..7121a84f0a2cb04c2fcacaa8b86d7ee361dcd589 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -70,6 +58,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
@@ -99,7 +88,7 @@
                ps7_can_0: ps7-can@e0008000 {
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 19>, <&clkc 36>;
-                       compatible = "xlnx,ps7-can-1.00.a";
+                       compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 28 4>;
                        reg = <0xe0008000 0x1000>;
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                        interrupts = <0 44 4>;
                        phy_type = "ulpi";
                        reg = <0xe0003000 0x1000>;
-                       xlnx,usb-reset = <0xffffffff>;
                } ;
                ps7_wdt_0: ps7-wdt@f8005000 {
                        clocks = <&clkc 45>;
index 40e65fbb2c999775b05f18d79317a1ce285eb7be..dc88e7d822b4c5f33e922395fe17541271b0610f 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -71,6 +59,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                ps7_can_1: ps7-can@e0009000 {
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 20>, <&clkc 37>;
-                       compatible = "xlnx,ps7-can-1.00.a";
+                       compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 51 4>;
                        reg = <0xe0009000 0x1000>;
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                ps7_ttc_1: ps7-ttc@f8002000 {
                        clocks = <&clkc 6>;
                        compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc";
+                       interrupt-names = "ttc0", "ttc1", "ttc2";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 37 4>, <0 38 4>, <0 39 4>;
                        reg = <0xf8002000 0x1000>;
index 618ae0e8418cff070cbcbfda8fff2bf0098c963e..7922a6ed428be738b3e1cba8833435fe094776e7 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -72,6 +60,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                ps7_can_1: ps7-can@e0009000 {
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 20>, <&clkc 37>;
-                       compatible = "xlnx,ps7-can-1.00.a";
+                       compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 51 4>;
                        reg = <0xe0009000 0x1000>;
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
index 67851c218590c278cce10c4258ed16bebe18ef5e..911b88a314bd33aad1b7e544e993990b68118a4f 100644 (file)
@@ -7,21 +7,6 @@
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
  * CAUTION: This file is automatically generated by libgen.
  * Version: Xilinx EDK 14.5 EDK_P.58f
  *
        } ;
        cpus {
                #address-cells = <1>;
-               #cpus = <0x2>;
                #size-cells = <0>;
                ps7_cortexa9_0: cpu@0 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x0>;
                } ;
                ps7_cortexa9_1: cpu@1 {
+                       bus-handle = <&ps7_axi_interconnect_0>;
                        compatible = "arm,cortex-a9";
                        d-cache-line-size = <0x20>;
                        d-cache-size = <0x8000>;
                        device_type = "cpu";
                        i-cache-line-size = <0x20>;
                        i-cache-size = <0x8000>;
+                       interrupt-handle = <&ps7_scugic_0>;
                        reg = <0x1>;
                } ;
        } ;
@@ -70,6 +58,7 @@
                interrupt-parent = <&ps7_scugic_0>;
                interrupts = <0 5 4>, <0 6 4>;
                reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>;
+               reg-names = "cpu0", "cpu1";
        } ;
        ps7_ddr_0: memory@0 {
                device_type = "memory";
                        #dma-channels = <8>;
                        #dma-requests = <4>;
                        arm,primecell-periphid = <0x41330>;
+                       clock-names = "apb_pclk";
                        clocks = <&clkc 27>;
                        compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330";
+                       interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
+                               "dma4", "dma5", "dma6", "dma7";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>;
                        reg = <0xf8003000 0x1000>;
                        #size-cells = <1>;
                        compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic";
                        interrupt-controller ;
+                       num_cpus = <2>;
+                       num_interrupts = <96>;
                        reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>;
                } ;
                ps7_scutimer_0: ps7-scutimer@f8f00600 {
                        clock-frequency = <50000000>;
                        clock-names = "ref_clk", "aper_clk";
                        clocks = <&clkc 21>, <&clkc 32>;
-                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci";
+                       compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci", "arasan,sdhci";
                        interrupt-parent = <&ps7_scugic_0>;
                        interrupts = <0 24 4>;
                        reg = <0xe0100000 0x1000>;
                                                "uart0_aper", "uart1_aper", "gpio_aper", "lqspi_aper", "smc_aper",
                                                "swdt", "dbg_trc", "dbg_apb";
                                        compatible = "xlnx,ps7-clkc";
+                                       fclk-enable = <0xf>;
                                        ps-clk-frequency = <33333333>;
                                } ;
                        } ;
                        interrupts = <0 21 4>;
                        phy_type = "ulpi";
                        reg = <0xe0002000 0x1000>;
-                       xlnx,usb-reset = <0xffffffff>;
                } ;
                ps7_xadc: ps7-xadc@f8007100 {
                        clocks = <&clkc 12>;