diff options
Diffstat (limited to 'conf/machine/boards/common/zynq7-base.dtsi')
-rw-r--r-- | conf/machine/boards/common/zynq7-base.dtsi | 97 |
1 files changed, 48 insertions, 49 deletions
diff --git a/conf/machine/boards/common/zynq7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi index c8ffd753..f9104d72 100644 --- a/conf/machine/boards/common/zynq7-base.dtsi +++ b/conf/machine/boards/common/zynq7-base.dtsi @@ -106,7 +106,7 @@ ps7_axi_interconnect_0: amba@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "xlnx,ps7-axi-interconnect-1.00.a", "simple-bus"; + compatible = "simple-bus", "xlnx,ps7-axi-interconnect-1.00.a"; ranges ; ps7_afi_0: ps7-afi@f8008000 { compatible = "xlnx,ps7-afi-1.00.a"; @@ -128,14 +128,14 @@ #address-cells = <2>; #interrupt-cells = <3>; #size-cells = <1>; - compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic"; + compatible = "arm,cortex-a9-gic", "arm,gic", "xlnx,ps7-scugic-1.00.a"; interrupt-controller ; num_cpus = <2>; num_interrupts = <96>; reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>; } ; ps7_pl310_0: ps7-pl310@f8f02000 { - compatible = "xlnx,ps7-pl310-1.00.a", "arm,pl310-cache"; + compatible = "arm,pl310-cache", "xlnx,ps7-pl310-1.00.a"; cache-unified; cache-level = <2>; reg = <0xf8f02000 0x1000>; @@ -145,7 +145,7 @@ arm,tag-latency = <2 2 2>; } ; ps7_ddrc_0: ps7-ddrc@f8006000 { - compatible = "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc", "xlnx,zynq-ddrc-1.0"; + compatible = "xlnx,zynq-ddrc-1.0", "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc"; reg = <0xf8006000 0x1000>; xlnx,has-ecc = <0x0>; } ; @@ -155,16 +155,10 @@ interrupts = <0 3 4>; reg = <0xf800c000 0x1000>; } ; - ps7_ram_0: ps7-ram@fffc0000 { - compatible = "xlnx,ps7-ram-1.00.a", "xlnx,ps7-ocm"; - interrupt-parent = <&ps7_scugic_0>; - interrupts = <0 3 4>; - reg = <0xfffc0000 0x40000>; - } ; ps7_slcr_0: ps7-slcr@f8000000 { #address-cells = <1>; #size-cells = <1>; - compatible = "xlnx,ps7-slcr-1.00.a", "xlnx,zynq-slcr", "syscon"; + compatible = "xlnx,zynq-slcr", "syscon", "xlnx,ps7-slcr-1.00.a"; ranges ; reg = <0xf8000000 0x1000>; clkc: clkc@100 { @@ -197,14 +191,14 @@ } ; ps7_globaltimer_0: ps7-globaltimer@f8f00200 { clocks = <&clkc 4>; - compatible = "xlnx,ps7-globaltimer-1.00.a", "arm,cortex-a9-global-timer"; + compatible = "arm,cortex-a9-global-timer", "xlnx,ps7-globaltimer-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <1 11 0x301>; reg = <0xf8f00200 0x100>; } ; ps7_scutimer_0: ps7-scutimer@f8f00600 { clocks = <&clkc 4>; - compatible = "xlnx,ps7-scutimer-1.00.a", "arm,cortex-a9-twd-timer"; + compatible = "arm,cortex-a9-twd-timer", "xlnx,ps7-scutimer-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <1 13 0x301>; reg = <0xf8f00600 0x20>; @@ -219,13 +213,14 @@ } ; ps7_wdt_0: ps7-wdt@f8005000 { clocks = <&clkc 45>; - compatible = "xlnx,ps7-wdt-1.00.a"; + compatible = "xlnx,zynq-wdt-r1p2", "xlnx,ps7-wdt-1.00.a"; device_type = "watchdog"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 9 4>; reg = <0xf8005000 0x1000>; reset = <0>; timeout = <10>; + timeout-sec = <10>; } ; /*ps7_dma_ns: ps7-dma@f8004000 { #dma-cells = <1>; @@ -234,7 +229,7 @@ arm,primecell-periphid = <0x41330>; clock-names = "apb_pclk"; clocks = <&clkc 27>; - compatible = "xlnx,ps7-dma-1.00.a", "arm,pl330", "arm,primecell"; + compatible = "arm,pl330", "arm,primecell", "xlnx,ps7-dma-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7"; 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>; @@ -247,7 +242,7 @@ arm,primecell-periphid = <0x41330>; clock-names = "apb_pclk"; clocks = <&clkc 27>; - compatible = "xlnx,ps7-dma-1.00.a", "arm,pl330", "arm,primecell"; + compatible = "arm,pl330", "arm,primecell", "xlnx,ps7-dma-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7"; 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>; @@ -256,7 +251,7 @@ ps7_dev_cfg_0: ps7-dev-cfg@f8007000 { clock-names = "ref_clk", "fclk0", "fclk1", "fclk2", "fclk3"; clocks = <&clkc 12>, <&clkc 15>, <&clkc 16>, <&clkc 17>, <&clkc 18>; - compatible = "xlnx,ps7-dev-cfg-1.00.a", "xlnx,zynq-devcfg-1.0"; + compatible = "xlnx,zynq-devcfg-1.0", "xlnx,ps7-dev-cfg-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 8 4>; reg = <0xf8007000 0x100>; @@ -271,8 +266,8 @@ ps7_ethernet_0: ps7-ethernet@e000b000 { #address-cells = <1>; #size-cells = <0>; - clock-names = "ref_clk", "aper_clk", "pclk", "hclk", "tx_clk"; - clocks = <&clkc 13>, <&clkc 30>, <&clkc 30>, <&clkc 30>, <&clkc 13>; + clock-names = "pclk", "hclk", "tx_clk", "ref_clk", "aper_clk"; + clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>, <&clkc 13>, <&clkc 30>; compatible = "cdns,gem", "xlnx,ps7-ethernet-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 22 4>; @@ -290,8 +285,8 @@ ps7_ethernet_1: ps7-ethernet@e000c000 { #address-cells = <1>; #size-cells = <0>; - clock-names = "ref_clk", "aper_clk", "pclk", "hclk", "tx_clk"; - clocks = <&clkc 14>, <&clkc 31>, <&clkc 31>, <&clkc 31>, <&clkc 14>; + clock-names = "pclk", "hclk", "tx_clk", "ref_clk", "aper_clk"; + clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>, <&clkc 14>, <&clkc 31>; compatible = "cdns,gem", "xlnx,ps7-ethernet-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 45 4>; @@ -310,7 +305,7 @@ ps7_gpio_0: ps7-gpio@e000a000 { #gpio-cells = <2>; clocks = <&clkc 42>; - compatible = "xlnx,ps7-gpio-1.00.a", "xlnx,zynq-gpio-1.0"; + compatible = "xlnx,zynq-gpio-1.0", "xlnx,ps7-gpio-1.00.a"; emio-gpio-width = <64>; gpio-controller ; gpio-mask-high = <0x0>; @@ -321,9 +316,9 @@ } ; ps7_qspi_0: ps7-qspi@e000d000 { - clock-names = "ref_clk", "aper_clk", "pclk"; + clock-names = "ref_clk", "pclk", "aper_clk"; clocks = <&clkc 10>, <&clkc 43>, <&clkc 43>; - compatible = "xlnx,ps7-qspi-1.00.a", "xlnx,zynq-qspi-1.0"; + compatible = "xlnx,zynq-qspi-1.0", "xlnx,ps7-qspi-1.00.a"; reg = <0xe000d000 0x1000>; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 19 4>; @@ -343,9 +338,9 @@ } ; ps7_spi_0: ps7-spi@e0006000 { - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 25>, <&clkc 34>; - compatible = "xlnx,ps7-spi-1.00.a"; + clock-names = "ref_clk", "pclk", "aper_clk"; + clocks = <&clkc 25>, <&clkc 34>, <&clkc 34>; + compatible = "xlnx,zynq-spi-r1p6", "xlnx,ps7-spi-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 26 4>; num-chip-select = <4>; @@ -354,9 +349,9 @@ #size-cells = <0>; } ; ps7_spi_1: ps7-spi@e0007000 { - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 26>, <&clkc 35>; - compatible = "xlnx,ps7-spi-1.00.a"; + clock-names = "ref_clk", "pclk", "aper_clk"; + clocks = <&clkc 26>, <&clkc 35>, <&clkc 35>; + compatible = "xlnx,zynq-spi-r1p6", "xlnx,ps7-spi-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 49 4>; num-chip-select = <4>; @@ -366,10 +361,10 @@ } ; ps7_sd_0: ps7-sdio@e0100000 { - clock-names = "ref_clk", "aper_clk", "clk_xin", "clk_ahb"; + clock-names = "clk_xin", "clk_ahb", "ref_clk", "aper_clk"; clocks = <&clkc 21>, <&clkc 32>, <&clkc 21>, <&clkc 32>; clock-frequency = <50000000>; - compatible = "xlnx,ps7-sdio-1.00.a", "arasan,sdhci", "arasan,sdhci-8.9a", "generic-sdhci"; + compatible = "arasan,sdhci-8.9a", "arasan,sdhci", "generic-sdhci", "xlnx,ps7-sdio-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 24 4>; reg = <0xe0100000 0x1000>; @@ -378,10 +373,10 @@ xlnx,has-wp = <0x1>; } ; ps7_sd_1: ps7-sdio@e0101000 { - clock-names = "ref_clk", "aper_clk", "clk_xin", "clk_ahb"; + clock-names = "clk_xin", "clk_ahb", "ref_clk", "aper_clk"; clocks = <&clkc 22>, <&clkc 33>, <&clkc 22>, <&clkc 33>; clock-frequency = <50000000>; - compatible = "xlnx,ps7-sdio-1.00.a", "arasan,sdhci", "arasan,sdhci-8.9a", "generic-sdhci"; + compatible = "arasan,sdhci-8.9a", "arasan,sdhci", "generic-sdhci", "xlnx,ps7-sdio-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 47 4>; reg = <0xe0101000 0x1000>; @@ -392,7 +387,7 @@ ps7_ttc_0: ps7-ttc@f8001000 { clocks = <&clkc 6>; - compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc"; + compatible = "cdns,ttc", "xlnx,ps7-ttc-1.00.a"; interrupt-names = "ttc0", "ttc1", "ttc2"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 10 4>, <0 11 4>, <0 12 4>; @@ -400,7 +395,7 @@ } ; ps7_ttc_1: ps7-ttc@f8002000 { clocks = <&clkc 6>; - compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc"; + compatible = "cdns,ttc", "xlnx,ps7-ttc-1.00.a"; interrupt-names = "ttc0", "ttc1", "ttc2"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 37 4>, <0 38 4>, <0 39 4>; @@ -408,9 +403,9 @@ } ; ps7_uart_0: serial@e0000000 { - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 23>, <&clkc 40>; - compatible = "xlnx,ps7-uart-1.00.a", "xlnx,xuartps"; + clock-names = "uart_clk", "pclk", "ref_clk", "aper_clk"; + clocks = <&clkc 23>, <&clkc 40>, <&clkc 23>, <&clkc 40>; + compatible = "xlnx,xuartps", "cdns,uart-r1p8", "xlnx,ps7-uart-1.00.a"; device_type = "serial"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 27 4>; @@ -420,9 +415,9 @@ xlnx,has-modem = <0x0>; } ; ps7_uart_1: serial@e0001000 { - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 24>, <&clkc 41>; - compatible = "xlnx,ps7-uart-1.00.a", "xlnx,xuartps"; + clock-names = "uart_clk", "pclk", "ref_clk", "aper_clk"; + clocks = <&clkc 24>, <&clkc 41>, <&clkc 24>, <&clkc 41>; + compatible = "xlnx,xuartps", "cdns,uart-r1p8", "xlnx,ps7-uart-1.00.a"; device_type = "serial"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 50 4>; @@ -456,20 +451,24 @@ } ; ps7_can_0: ps7-can@e0008000 { - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 19>, <&clkc 36>; - compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can"; + clock-names = "can_clk", "pclk", "ref_clk", "aper_clk"; + clocks = <&clkc 19>, <&clkc 36>, <&clkc 19>, <&clkc 36>; + compatible = "xlnx,ps7-can-1.0", "xlnx,ps7-can", "xlnx,ps7-can-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 28 4>; reg = <0xe0008000 0x1000>; + tx-fifo-depth = <0x40>; + rx-fifo-depth = <0x40>; } ; ps7_can_1: ps7-can@e0009000 { - clock-names = "ref_clk", "aper_clk"; - clocks = <&clkc 20>, <&clkc 37>; - compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can"; + clock-names = "can_clk", "pclk", "ref_clk", "aper_clk"; + clocks = <&clkc 20>, <&clkc 37>, <&clkc 20>, <&clkc 37>; + compatible = "xlnx,ps7-can-1.0", "xlnx,ps7-can", "xlnx,ps7-can-1.00.a"; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 51 4>; reg = <0xe0009000 0x1000>; + tx-fifo-depth = <0x40>; + rx-fifo-depth = <0x40>; } ; ps7_usb_0: ps7-usb@e0002000 { @@ -495,7 +494,7 @@ ps7_xadc: ps7-xadc@f8007100 { clocks = <&clkc 12>; - compatible = "xlnx,ps7-xadc-1.00.a"; + compatible = "xlnx,zynq-xadc-1.00.a", "xlnx,ps7-xadc-1.00.a"; reg = <0xf8007100 0x20>; interrupt-parent = <&ps7_scugic_0>; interrupts = <0 7 4>; |