From a15c25d433b42d04b2f2d2569e0e55953934b03d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 23 Oct 2013 17:57:42 +1000 Subject: boards/common/zynq-7-base.dtsi: Updated for 'xlnx_3.8' kernel * Updated various nodes with newer properties and clock information * Fixed up compatible properties for some nodes * Refactored out some board specific properties * Cleaned up some style inconsistency Signed-off-by: Nathan Rossi --- conf/machine/boards/common/zynq-7-base.dtsi | 294 ++++++++++++++++------------ conf/machine/boards/qemu/qemuzynq.dts | 4 +- 2 files changed, 171 insertions(+), 127 deletions(-) diff --git a/conf/machine/boards/common/zynq-7-base.dtsi b/conf/machine/boards/common/zynq-7-base.dtsi index 9354ca68..c558d5a6 100644 --- a/conf/machine/boards/common/zynq-7-base.dtsi +++ b/conf/machine/boards/common/zynq-7-base.dtsi @@ -50,8 +50,7 @@ / { #address-cells = <0x1>; #size-cells = <0x1>; - compatible = "xlnx,zynq-7000", "xlnx,zynq-zc770"; - interrupt-parent = <0x1>; + compatible = "xlnx,zynq-7000"; aliases { ethernet0 = &ps7_ethernet_0; ethernet1 = &ps7_ethernet_1; @@ -60,34 +59,36 @@ } ; cpus { #address-cells = <1>; - #cpus = <0x2>; #size-cells = <0>; ps7_cortexa9_0: cpu@0 { - compatible = "xlnx,ps7-cortexa9-1.00.a"; + 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>; - model = "ps7_cortexa9,1.00.a"; - reg = <0>; + interrupt-handle = <&ps7_scugic_0>; + reg = <0x0>; } ; ps7_cortexa9_1: cpu@1 { - compatible = "xlnx,ps7-cortexa9-1.00.a"; + 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>; - model = "ps7_cortexa9,1.00.a"; - reg = <1>; + interrupt-handle = <&ps7_scugic_0>; + reg = <0x1>; } ; } ; pmu { compatible = "arm,cortex-a9-pmu"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 5 4 0 6 4 >; - reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >; + interrupts = <0 5 4>, <0 6 4>; + reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>; + reg-names = "cpu0", "cpu1"; } ; ps7_axi_interconnect_0: amba@0 { #address-cells = <1>; @@ -96,28 +97,32 @@ ranges ; ps7_afi_0: ps7-afi@f8008000 { compatible = "xlnx,ps7-afi-1.00.a"; - reg = < 0xf8008000 0x1000 >; + reg = <0xf8008000 0x1000>; } ; ps7_afi_1: ps7-afi@f8009000 { compatible = "xlnx,ps7-afi-1.00.a"; - reg = < 0xf8009000 0x1000 >; + reg = <0xf8009000 0x1000>; } ; ps7_afi_2: ps7-afi@f800a000 { compatible = "xlnx,ps7-afi-1.00.a"; - reg = < 0xf800a000 0x1000 >; + reg = <0xf800a000 0x1000>; } ; ps7_afi_3: ps7-afi@f800b000 { compatible = "xlnx,ps7-afi-1.00.a"; - reg = < 0xf800b000 0x1000 >; + reg = <0xf800b000 0x1000>; } ; ps7_scugic_0: ps7-scugic@f8f01000 { - #interrupt-cells = < 3 >; + #address-cells = <2>; + #interrupt-cells = <3>; + #size-cells = <1>; compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic"; interrupt-controller ; - reg = < 0xf8f01000 0x1000 >, < 0xf8f00100 0x100 >; + num_cpus = <2>; + num_interrupts = <96>; + reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>; } ; ps7_pl310_0: ps7-pl310@f8f02000 { - compatible = "arm,pl310-cache"; + compatible = "xlnx,ps7-pl310-1.00.a", "arm,pl310-cache"; cache-unified; cache-level = <2>; reg = <0xf8f02000 0x1000>; @@ -127,70 +132,71 @@ } ; ps7_ddrc_0: ps7-ddrc@f8006000 { compatible = "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc"; - reg = < 0xf8006000 0x1000 >; + reg = <0xf8006000 0x1000>; xlnx,has-ecc = <0x0>; } ; ps7_ram_0: ps7-ram@fffc0000 { compatible = "xlnx,ps7-ram-1.00.a", "xlnx,ps7-ocm"; - reg = < 0xfffc0000 0x40000 >; + interrupt-parent = <&ps7_scugic_0>; + interrupts = <0 3 4>; + reg = <0xfffc0000 0x40000>; } ; ps7_slcr_0: ps7-slcr@f8000000 { compatible = "xlnx,ps7-slcr-1.00.a", "xlnx,zynq-slcr"; - reg = < 0xf8000000 0x1000 >; + reg = <0xf8000000 0x1000>; clocks { #address-cells = <1>; #size-cells = <0>; - armpll: armpll { - #clock-cells = <0>; - clock-output-names = "armpll"; - clocks = <&ps_clk>; - compatible = "xlnx,zynq-pll"; - lockbit = <0>; - reg = < 0x100 0x110 0x10c >; - } ; - ddrpll: ddrpll { - #clock-cells = <0>; - clock-output-names = "ddrpll"; - clocks = <&ps_clk>; - compatible = "xlnx,zynq-pll"; - lockbit = <1>; - reg = < 0x104 0x114 0x10c >; - } ; - iopll: iopll { - #clock-cells = <0>; - clock-output-names = "iopll"; - clocks = <&ps_clk>; - compatible = "xlnx,zynq-pll"; - lockbit = <2>; - reg = < 0x108 0x118 0x10c >; - } ; - ps_clk: ps_clk { - #clock-cells = <0>; - clock-frequency = <33333333>; - clock-output-names = "ps_clk"; - compatible = "fixed-clock"; + clkc: clkc { + #clock-cells = <1>; + clock-output-names = "armpll", "ddrpll", "iopll", + "cpu_6or4x", "cpu_3or2x", "cpu_2x", "cpu_1x", + "ddr2x", "ddr3x", "dci", + "lqspi", "smc", "pcap", + "gem0", "gem1", + "fclk0", "fclk1", "fclk2", "fclk3", + "can0", "can1", + "sdio0", "sdio1", + "uart0", "uart1", + "spi0", "spi1", + "dma", + "usb0_aper", "usb1_aper", + "gem0_aper", "gem1_aper", + "sdio0_aper", "sdio1_aper", + "spi0_aper", "spi1_aper", + "can0_aper", "can1_aper", + "i2c0_aper", "i2c1_aper", + "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_scutimer_0: ps7-scutimer@f8f00600 { + clocks = <&clkc 4>; compatible = "xlnx,ps7-scutimer-1.00.a", "arm,cortex-a9-twd-timer"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 1 13 769 >; - reg = < 0xf8f00600 0x20 >; + interrupts = <1 13 0x301>; + reg = <0xf8f00600 0x20>; } ; ps7_scuwdt_0: ps7-scuwdt@f8f00620 { + clocks = <&clkc 4>; compatible = "xlnx,ps7-scuwdt-1.00.a"; device_type = "watchdog"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 1 14 769 >; - reg = < 0xf8f00620 0xe0 >; + interrupts = <1 14 0x301>; + reg = <0xf8f00620 0xe0>; } ; ps7_wdt_0: ps7-wdt@f8005000 { + clocks = <&clkc 45>; compatible = "xlnx,ps7-wdt-1.00.a"; - reg = < 0xf8005000 0x1000 >; - interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 9 4 >; device_type = "watchdog"; + interrupt-parent = <&ps7_scugic_0>; + interrupts = <0 9 4>; + reg = <0xf8005000 0x1000>; reset = <0>; timeout = <10>; } ; @@ -199,30 +205,38 @@ #dma-channels = <8>; #dma-requests = <4>; arm,primecell-periphid = <0x41330>; - compatible = "xlnx,ps7-dma-1.00.a", "arm,pl330"; + clock-names = "apb_pclk"; + clocks = <&clkc 27>; + compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330"; 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 = < 0xf8004000 0x1000 >; + 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>; + reg = <0xf8004000 0x1000>; } ; ps7_dma_s: ps7-dma@f8003000 { #dma-cells = <1>; #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-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 >; + 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>; + reg = <0xf8003000 0x1000>; } ; 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"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 8 4 >; - reg = < 0xf8007000 0x100 >; + interrupts = <0 8 4>; + reg = <0xf8007000 0x100>; } ; ps7_iop_bus_config_0: ps7-iop-bus-config@e0200000 { compatible = "xlnx,ps7-iop-bus-config-1.00.a"; - reg = < 0xe0200000 0x1000 >; + reg = <0xe0200000 0x1000>; } ; /* ========= Peripherals ========= */ @@ -230,11 +244,14 @@ ps7_ethernet_0: ps7-ethernet@e000b000 { #address-cells = <1>; #size-cells = <0>; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 13>, <&clkc 30>; compatible = "xlnx,ps7-ethernet-1.00.a"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 22 1 >; + interrupts = <0 22 4>; local-mac-address = [ 00 0a 35 00 00 00 ]; - reg = < 0xe000b000 0x1000 >; + reg = <0xe000b000 0x1000>; + xlnx,enet-reset = <0xffffffff>; xlnx,eth-mode = <0x1>; xlnx,has-mdio = <0x1>; xlnx,ptp-enet-clock = <111111115>; @@ -246,11 +263,14 @@ ps7_ethernet_1: ps7-ethernet@e000c000 { #address-cells = <1>; #size-cells = <0>; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 14>, <&clkc 31>; compatible = "xlnx,ps7-ethernet-1.00.a"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 45 1 >; + interrupts = <0 45 1>; local-mac-address = [ 00 0a 35 00 00 01 ]; - reg = < 0xe000c000 0x1000 >; + reg = <0xe000c000 0x1000>; + xlnx,enet-reset = <0xffffffff>; xlnx,eth-mode = <0x1>; xlnx,has-mdio = <0x1>; xlnx,ptp-enet-clock = <111111115>; @@ -262,175 +282,199 @@ ps7_gpio_0: ps7-gpio@e000a000 { #gpio-cells = <2>; + clocks = <&clkc 42>; compatible = "xlnx,ps7-gpio-1.00.a"; emio-gpio-width = <64>; gpio-controller ; - gpio-mask-high = <0xc0000>; - gpio-mask-low = <0xfe81>; + gpio-mask-high = <0x0>; + gpio-mask-low = <0x0>; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 20 4 >; - reg = < 0xe000a000 0x1000 >; + interrupts = <0 20 4>; + reg = <0xe000a000 0x1000>; } ; ps7_qspi_0: ps7-qspi@e000d000 { + bus-num = <2>; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 10>, <&clkc 43>; compatible = "xlnx,ps7-qspi-1.00.a"; - reg = < 0xe000d000 0x1000 >; + reg = <0xe000d000 0x1000>; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 19 4 >; - bus-num = <2>; + interrupts = <0 19 4>; is-dual = <0>; num-chip-select = <1>; speed-hz = <200000000>; + xlnx,fb-clk = <0x1>; + xlnx,qspi-mode = <0x0>; #address-cells = <1>; #size-cells = <0>; } ; ps7_qspi_linear_0: ps7-qspi-linear@fc000000 { compatible = "xlnx,ps7-qspi-linear-1.00.a"; - reg = < 0xfc000000 0x1000000 >; + reg = <0xfc000000 0x1000000>; } ; ps7_spi_0: ps7-spi@e0006000 { + bus-num = <0>; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 25>, <&clkc 34>; compatible = "xlnx,ps7-spi-1.00.a"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 26 4 >; - bus-num = <0>; + interrupts = <0 26 4>; num-chip-select = <4>; - reg = < 0xe0006000 0x1000 >; + reg = <0xe0006000 0x1000>; speed-hz = <166666666>; #address-cells = <1>; #size-cells = <0>; } ; ps7_spi_1: ps7-spi@e0007000 { + bus-num = <1>; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 26>, <&clkc 35>; compatible = "xlnx,ps7-spi-1.00.a"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 49 4 >; - bus-num = <1>; + interrupts = <0 49 4>; num-chip-select = <4>; - reg = < 0xe0007000 0x1000 >; + reg = <0xe0007000 0x1000>; speed-hz = <166666666>; #address-cells = <1>; #size-cells = <0>; } ; ps7_sd_0: ps7-sdio@e0100000 { + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 21>, <&clkc 32>; clock-frequency = <50000000>; - 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 >; + interrupts = <0 24 4>; + reg = <0xe0100000 0x1000>; xlnx,has-cd = <0x1>; xlnx,has-power = <0x0>; xlnx,has-wp = <0x1>; - xlnx,sdio-clk-freq-hz = <0x2faf080>; } ; ps7_sd_1: ps7-sdio@e0101000 { + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 22>, <&clkc 33>; clock-frequency = <50000000>; - 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 47 4 >; - reg = < 0xe0101000 0x1000 >; + interrupts = <0 47 4>; + reg = <0xe0101000 0x1000>; xlnx,has-cd = <0x1>; xlnx,has-power = <0x0>; xlnx,has-wp = <0x1>; - xlnx,sdio-clk-freq-hz = <0x2faf080>; } ; ps7_ttc_0: ps7-ttc@f8001000 { - compatible = "xlnx,ps7-ttc-1.00.a"; + clocks = <&clkc 6>; + compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc"; + interrupt-names = "ttc0", "ttc1", "ttc2"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 10 4 0 11 4 0 12 4 >; - reg = < 0xf8001000 0x1000 >; + interrupts = <0 10 4>, <0 11 4>, <0 12 4>; + reg = <0xf8001000 0x1000>; } ; ps7_ttc_1: ps7-ttc@f8002000 { - compatible = "xlnx,ps7-ttc-1.00.a"; + 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 37 4>, <0 38 4>, <0 39 4>; + reg = <0xf8002000 0x1000>; } ; 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"; - reg = < 0xe0000000 0x1000 >; - interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 27 4 >; device_type = "serial"; + interrupt-parent = <&ps7_scugic_0>; + interrupts = <0 27 4>; + reg = <0xe0000000 0x1000>; port-number = <1>; current-speed = <115200>; xlnx,has-modem = <0x0>; - xlnx,uart-clk-freq-hz = <0x2faf080>; } ; 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"; - reg = < 0xe0001000 0x1000 >; - interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 50 4 >; device_type = "serial"; + interrupt-parent = <&ps7_scugic_0>; + interrupts = <0 50 4>; + reg = <0xe0001000 0x1000>; port-number = <0>; current-speed = <115200>; xlnx,has-modem = <0x0>; - xlnx,uart-clk-freq-hz = <0x2faf080>; } ; ps7_i2c_0: ps7-i2c@e0004000 { + bus-id = <0>; + clocks = <&clkc 38>; compatible = "xlnx,ps7-i2c-1.00.a"; - reg = < 0xe0004000 0x1000 >; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 25 4 >; - bus-id = <0>; + interrupts = <0 25 4>; + reg = <0xe0004000 0x1000>; i2c-clk = <400000>; - input-clk = <111111114>; #address-cells = <1>; #size-cells = <0>; } ; ps7_i2c_1: ps7-i2c@e0005000 { + bus-id = <1>; + clocks = <&clkc 39>; compatible = "xlnx,ps7-i2c-1.00.a"; - reg = < 0xe0005000 0x1000 >; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 48 4 >; - bus-id = <1>; + interrupts = <0 48 4>; + reg = <0xe0005000 0x1000>; i2c-clk = <400000>; - input-clk = <111111114>; #address-cells = <1>; #size-cells = <0>; } ; ps7_can_0: ps7-can@e0008000 { - compatible = "xlnx,ps7-can-1.00.a"; - reg = < 0xe0008000 0x1000 >; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 19>, <&clkc 36>; + compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 28 4 >; + interrupts = <0 28 4>; + reg = <0xe0008000 0x1000>; } ; ps7_can_1: ps7-can@e0009000 { - compatible = "xlnx,ps7-can-1.00.a"; - reg = < 0xe0009000 0x1000 >; + clock-names = "ref_clk", "aper_clk"; + clocks = <&clkc 20>, <&clkc 37>; + compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can"; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 51 4 >; + interrupts = <0 51 4>; + reg = <0xe0009000 0x1000>; } ; ps7_usb_0: ps7-usb@e0002000 { + clocks = <&clkc 28>; compatible = "xlnx,ps7-usb-1.00.a"; - reg = < 0xe0002000 0x1000 >; + reg = <0xe0002000 0x1000>; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 21 4 >; + interrupts = <0 21 4>; dr_mode = "host"; phy_type = "ulpi"; xlnx,usb-reset = <0xffffffff>; } ; ps7_usb_1: ps7-usb@e0003000 { + clocks = <&clkc 29>; compatible = "xlnx,ps7-usb-1.00.a"; - reg = < 0xe0003000 0x1000 >; + reg = <0xe0003000 0x1000>; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 44 4 >; + interrupts = <0 44 4>; dr_mode = "host"; phy_type = "ulpi"; xlnx,usb-reset = <0xffffffff>; } ; ps7_xadc: ps7-xadc@f8007100 { + clocks = <&clkc 12>; compatible = "xlnx,ps7-xadc-1.00.a"; - reg = < 0xf8007100 0x20 >; + reg = <0xf8007100 0x20>; interrupt-parent = <&ps7_scugic_0>; - interrupts = < 0 7 4 >; + interrupts = <0 7 4>; } ; } ; } ; diff --git a/conf/machine/boards/qemu/qemuzynq.dts b/conf/machine/boards/qemu/qemuzynq.dts index 772144fa..a4161dac 100644 --- a/conf/machine/boards/qemu/qemuzynq.dts +++ b/conf/machine/boards/qemu/qemuzynq.dts @@ -8,7 +8,7 @@ } ; ps7_ddr_0: memory@0 { device_type = "memory"; - reg = < 0x0 0x40000000 >; + reg = <0x0 0x40000000>; } ; ps7_axi_interconnect_0: amba@0 { ps7_ethernet_0: ps7-ethernet@e000b000 { @@ -27,7 +27,7 @@ #address-cells = <1>; #size-cells = <1>; compatible = "st,m25p80"; - reg = < 0x0 >; + reg = <0x0>; spi-max-frequency = <50000000>; partition@0x00000000 { label = "boot"; -- cgit v1.2.3-54-g00ecf