From 29b9a052e1b31373d09f7c771660fcac935c216c Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Mon, 16 Jan 2012 14:33:04 +0100 Subject: [PATCH] ethernetgmii: updated misc files from SDK --- microblaze/ethernetgmii/misc/system.mss | 48 +++--- microblaze/ethernetgmii/misc/xilinx.dts | 279 ++++++++++++++++++++------------ 2 files changed, 208 insertions(+), 119 deletions(-) diff --git a/microblaze/ethernetgmii/misc/system.mss b/microblaze/ethernetgmii/misc/system.mss index 5faf108..ceede7d 100644 --- a/microblaze/ethernetgmii/misc/system.mss +++ b/microblaze/ethernetgmii/misc/system.mss @@ -25,39 +25,39 @@ BEGIN DRIVER END BEGIN DRIVER - PARAMETER DRIVER_NAME = gpio - PARAMETER DRIVER_VER = 3.00.a - PARAMETER HW_INSTANCE = DIP_Switches_8Bits + PARAMETER DRIVER_NAME = axidma + PARAMETER DRIVER_VER = 4.00.a + PARAMETER HW_INSTANCE = ETHERNET_dma END BEGIN DRIVER - PARAMETER DRIVER_NAME = axiethernet - PARAMETER DRIVER_VER = 1.02.a - PARAMETER HW_INSTANCE = ETHERNET + PARAMETER DRIVER_NAME = iic + PARAMETER DRIVER_VER = 2.03.a + PARAMETER HW_INSTANCE = IIC_DVI END BEGIN DRIVER - PARAMETER DRIVER_NAME = axidma - PARAMETER DRIVER_VER = 4.00.a - PARAMETER HW_INSTANCE = ETHERNET_dma + PARAMETER DRIVER_NAME = iic + PARAMETER DRIVER_VER = 2.03.a + PARAMETER HW_INSTANCE = IIC_EEPROM END BEGIN DRIVER - PARAMETER DRIVER_NAME = gpio - PARAMETER DRIVER_VER = 3.00.a - PARAMETER HW_INSTANCE = LEDs_8Bits + PARAMETER DRIVER_NAME = iic + PARAMETER DRIVER_VER = 2.03.a + PARAMETER HW_INSTANCE = IIC_FMC END BEGIN DRIVER - PARAMETER DRIVER_NAME = gpio - PARAMETER DRIVER_VER = 3.00.a - PARAMETER HW_INSTANCE = LEDs_Positions + PARAMETER DRIVER_NAME = iic + PARAMETER DRIVER_VER = 2.03.a + PARAMETER HW_INSTANCE = IIC_SFP END BEGIN DRIVER - PARAMETER DRIVER_NAME = gpio - PARAMETER DRIVER_VER = 3.00.a - PARAMETER HW_INSTANCE = Push_Buttons_5Bits + PARAMETER DRIVER_NAME = emc + PARAMETER DRIVER_VER = 3.01.a + PARAMETER HW_INSTANCE = Linear_Flash END BEGIN DRIVER @@ -67,6 +67,18 @@ BEGIN DRIVER END BEGIN DRIVER + PARAMETER DRIVER_NAME = sysace + PARAMETER DRIVER_VER = 2.00.a + PARAMETER HW_INSTANCE = SysACE_CompactFlash +END + +BEGIN DRIVER + PARAMETER DRIVER_NAME = axiethernet + PARAMETER DRIVER_VER = 1.02.a + PARAMETER HW_INSTANCE = axi_ethernet_0 +END + +BEGIN DRIVER PARAMETER DRIVER_NAME = tmrctr PARAMETER DRIVER_VER = 2.03.a PARAMETER HW_INSTANCE = axi_timer_0 diff --git a/microblaze/ethernetgmii/misc/xilinx.dts b/microblaze/ethernetgmii/misc/xilinx.dts index c9ec2c6..469e532 100644 --- a/microblaze/ethernetgmii/misc/xilinx.dts +++ b/microblaze/ethernetgmii/misc/xilinx.dts @@ -38,7 +38,7 @@ reg = < 0xc0000000 0x10000000 >; } ; aliases { - ethernet0 = ÐERNET; + ethernet0 = &axi_ethernet_0; serial0 = &RS232_Uart_1; } ; chosen { @@ -98,7 +98,7 @@ xlnx,fsl-data-size = <0x20>; xlnx,fsl-exception = <0x0>; xlnx,fsl-links = <0x0>; - xlnx,i-axi = <0x0>; + xlnx,i-axi = <0x1>; xlnx,i-lmb = <0x1>; xlnx,i-plb = <0x0>; xlnx,icache-always-used = <0x1>; @@ -112,9 +112,7 @@ xlnx,ill-opcode-exception = <0x1>; xlnx,instance = "microblaze_0"; xlnx,interconnect = <0x2>; - xlnx,interconnect-m-axi-dc-aw-register = <0x0>; xlnx,interconnect-m-axi-dc-read-issuing = <0x2>; - xlnx,interconnect-m-axi-dc-w-register = <0x0>; xlnx,interconnect-m-axi-dc-write-issuing = <0x20>; xlnx,interconnect-m-axi-dp-read-issuing = <0x1>; xlnx,interconnect-m-axi-dp-write-issuing = <0x1>; @@ -161,63 +159,11 @@ #size-cells = <1>; compatible = "xlnx,axi-interconnect-1.03.a", "simple-bus"; ranges ; - DIP_Switches_8Bits: gpio@40060000 { - compatible = "xlnx,axi-gpio-1.01.a", "xlnx,xps-gpio-1.00.a"; - reg = < 0x40060000 0x10000 >; - xlnx,all-inputs = <0x1>; - xlnx,all-inputs-2 = <0x0>; - xlnx,dout-default = <0x0>; - xlnx,dout-default-2 = <0x0>; - xlnx,family = "virtex6"; - xlnx,gpio-width = <0x8>; - xlnx,gpio2-width = <0x20>; - xlnx,interrupt-present = <0x0>; - xlnx,is-dual = <0x0>; - xlnx,tri-default = <0xffffffff>; - xlnx,tri-default-2 = <0xffffffff>; - } ; - ETHERNET: axi-ethernet@41240000 { - axistream-connected = <ÐERNET_dma>; - compatible = "xlnx,axi-ethernet-2.01.a", "xlnx,axi-ethernet-1.00.a"; - device_type = "network"; - interrupt-parent = <µblaze_0_intc>; - interrupts = < 3 2 >; - local-mac-address = [ 00 0a 35 6c 2b 00 ]; - phy-handle = <&phy0>; - reg = < 0x41240000 0x40000 >; - xlnx,avb = <0x0>; - xlnx,halfdup = <0x0>; - xlnx,include-io = <0x1>; - xlnx,mcast-extend = <0x0>; - xlnx,phy-type = <0x1>; - xlnx,phyaddr = "0B00001"; - xlnx,rxcsum = <0x2>; - xlnx,rxmem = <0x4000>; - xlnx,rxvlan-strp = <0x0>; - xlnx,rxvlan-tag = <0x0>; - xlnx,rxvlan-tran = <0x0>; - xlnx,stats = <0x0>; - xlnx,txcsum = <0x2>; - xlnx,txmem = <0x4000>; - xlnx,txvlan-strp = <0x0>; - xlnx,txvlan-tag = <0x0>; - xlnx,txvlan-tran = <0x0>; - xlnx,type = <0x2>; - mdio { - #address-cells = <1>; - #size-cells = <0>; - phy0: phy@7 { - compatible = "marvell,88e1111"; - device_type = "ethernet-phy"; - reg = <7>; - } ; - } ; - } ; - ETHERNET_dma: axi-dma@41e00000 { + ETHERNET_dma: axi-dma@41f00000 { compatible = "xlnx,axi-dma-3.00.a"; interrupt-parent = <µblaze_0_intc>; interrupts = < 1 2 0 2 >; - reg = < 0x41e00000 0x10000 >; + reg = < 0x41f00000 0x10000 >; xlnx,dlytmr-resolution = <0x4e2>; xlnx,family = "virtex6"; xlnx,include-mm2s = <0x1>; @@ -242,50 +188,135 @@ xlnx,sg-length-width = <0x10>; xlnx,sg-use-stsapp-length = <0x1>; } ; - LEDs_8Bits: gpio@40040000 { - compatible = "xlnx,axi-gpio-1.01.a", "xlnx,xps-gpio-1.00.a"; - reg = < 0x40040000 0x10000 >; - xlnx,all-inputs = <0x0>; - xlnx,all-inputs-2 = <0x0>; - xlnx,dout-default = <0x0>; - xlnx,dout-default-2 = <0x0>; + IIC_DVI: i2c@40860000 { + compatible = "xlnx,axi-iic-1.01.a", "xlnx,xps-iic-2.00.a"; + interrupt-parent = <µblaze_0_intc>; + interrupts = < 7 2 >; + reg = < 0x40860000 0x10000 >; xlnx,family = "virtex6"; - xlnx,gpio-width = <0x8>; - xlnx,gpio2-width = <0x20>; - xlnx,interrupt-present = <0x0>; - xlnx,is-dual = <0x0>; - xlnx,tri-default = <0xffffffff>; - xlnx,tri-default-2 = <0xffffffff>; + xlnx,gpo-width = <0x1>; + xlnx,iic-freq = <0x186a0>; + xlnx,s-axi-aclk-freq-hz = <0x2faf080>; + xlnx,scl-inertial-delay = <0x0>; + xlnx,sda-inertial-delay = <0x0>; + xlnx,sda-level = <0x1>; + xlnx,ten-bit-adr = <0x0>; } ; - LEDs_Positions: gpio@40020000 { - compatible = "xlnx,axi-gpio-1.01.a", "xlnx,xps-gpio-1.00.a"; - reg = < 0x40020000 0x10000 >; - xlnx,all-inputs = <0x0>; - xlnx,all-inputs-2 = <0x0>; - xlnx,dout-default = <0x0>; - xlnx,dout-default-2 = <0x0>; + IIC_EEPROM: i2c@40840000 { + compatible = "xlnx,axi-iic-1.01.a", "xlnx,xps-iic-2.00.a"; + interrupt-parent = <µblaze_0_intc>; + interrupts = < 8 2 >; + reg = < 0x40840000 0x10000 >; xlnx,family = "virtex6"; - xlnx,gpio-width = <0x5>; - xlnx,gpio2-width = <0x20>; - xlnx,interrupt-present = <0x0>; - xlnx,is-dual = <0x0>; - xlnx,tri-default = <0xffffffff>; - xlnx,tri-default-2 = <0xffffffff>; + xlnx,gpo-width = <0x1>; + xlnx,iic-freq = <0x186a0>; + xlnx,s-axi-aclk-freq-hz = <0x2faf080>; + xlnx,scl-inertial-delay = <0x0>; + xlnx,sda-inertial-delay = <0x0>; + xlnx,sda-level = <0x1>; + xlnx,ten-bit-adr = <0x0>; } ; - Push_Buttons_5Bits: gpio@40000000 { - compatible = "xlnx,axi-gpio-1.01.a", "xlnx,xps-gpio-1.00.a"; - reg = < 0x40000000 0x10000 >; - xlnx,all-inputs = <0x1>; - xlnx,all-inputs-2 = <0x0>; - xlnx,dout-default = <0x0>; - xlnx,dout-default-2 = <0x0>; + IIC_FMC: i2c@40820000 { + compatible = "xlnx,axi-iic-1.01.a", "xlnx,xps-iic-2.00.a"; + interrupt-parent = <µblaze_0_intc>; + interrupts = < 6 2 >; + reg = < 0x40820000 0x10000 >; xlnx,family = "virtex6"; - xlnx,gpio-width = <0x5>; - xlnx,gpio2-width = <0x20>; - xlnx,interrupt-present = <0x0>; - xlnx,is-dual = <0x0>; - xlnx,tri-default = <0xffffffff>; - xlnx,tri-default-2 = <0xffffffff>; + xlnx,gpo-width = <0x1>; + xlnx,iic-freq = <0x186a0>; + xlnx,s-axi-aclk-freq-hz = <0x2faf080>; + xlnx,scl-inertial-delay = <0x0>; + xlnx,sda-inertial-delay = <0x0>; + xlnx,sda-level = <0x1>; + xlnx,ten-bit-adr = <0x0>; + } ; + IIC_SFP: i2c@40800000 { + compatible = "xlnx,axi-iic-1.01.a", "xlnx,xps-iic-2.00.a"; + interrupt-parent = <µblaze_0_intc>; + interrupts = < 5 2 >; + reg = < 0x40800000 0x10000 >; + xlnx,family = "virtex6"; + xlnx,gpo-width = <0x1>; + xlnx,iic-freq = <0x186a0>; + xlnx,s-axi-aclk-freq-hz = <0x2faf080>; + xlnx,scl-inertial-delay = <0x0>; + xlnx,sda-inertial-delay = <0x0>; + xlnx,sda-level = <0x1>; + xlnx,ten-bit-adr = <0x0>; + } ; + Linear_Flash: flash@76000000 { + bank-width = <2>; + compatible = "xlnx,axi-emc-1.01.a", "cfi-flash"; + reg = < 0x76000000 0x2000000 >; + xlnx,axi-clk-period-ps = <0x2710>; + xlnx,family = "virtex6"; + xlnx,include-datawidth-matching-0 = <0x1>; + xlnx,include-datawidth-matching-1 = <0x0>; + xlnx,include-datawidth-matching-2 = <0x0>; + xlnx,include-datawidth-matching-3 = <0x0>; + xlnx,include-negedge-ioregs = <0x0>; + xlnx,max-mem-width = <0x10>; + xlnx,mem0-type = <0x2>; + xlnx,mem0-width = <0x10>; + xlnx,mem1-type = <0x0>; + xlnx,mem1-width = <0x20>; + xlnx,mem2-type = <0x0>; + xlnx,mem2-width = <0x20>; + xlnx,mem3-type = <0x0>; + xlnx,mem3-width = <0x20>; + xlnx,num-banks-mem = <0x1>; + xlnx,parity-type-mem-0 = <0x0>; + xlnx,parity-type-mem-1 = <0x0>; + xlnx,parity-type-mem-2 = <0x0>; + xlnx,parity-type-mem-3 = <0x0>; + xlnx,s-axi-en-reg = <0x0>; + xlnx,s-axi-mem-addr-width = <0x20>; + xlnx,s-axi-mem-data-width = <0x20>; + xlnx,s-axi-mem-id-width = <0x1>; + xlnx,s-axi-mem-protocol = "AXI4LITE"; + xlnx,s-axi-reg-addr-width = <0x20>; + xlnx,s-axi-reg-data-width = <0x20>; + xlnx,s-axi-reg-protocol = "axi4"; + xlnx,synch-pipedelay-0 = <0x2>; + xlnx,synch-pipedelay-1 = <0x2>; + xlnx,synch-pipedelay-2 = <0x2>; + xlnx,synch-pipedelay-3 = <0x2>; + xlnx,tavdv-ps-mem-0 = <0x1fbd0>; + xlnx,tavdv-ps-mem-1 = <0x3a98>; + xlnx,tavdv-ps-mem-2 = <0x3a98>; + xlnx,tavdv-ps-mem-3 = <0x3a98>; + xlnx,tcedv-ps-mem-0 = <0x1fbd0>; + xlnx,tcedv-ps-mem-1 = <0x3a98>; + xlnx,tcedv-ps-mem-2 = <0x3a98>; + xlnx,tcedv-ps-mem-3 = <0x3a98>; + xlnx,thzce-ps-mem-0 = <0x88b8>; + xlnx,thzce-ps-mem-1 = <0x1b58>; + xlnx,thzce-ps-mem-2 = <0x1b58>; + xlnx,thzce-ps-mem-3 = <0x1b58>; + xlnx,thzoe-ps-mem-0 = <0x1b58>; + xlnx,thzoe-ps-mem-1 = <0x1b58>; + xlnx,thzoe-ps-mem-2 = <0x1b58>; + xlnx,thzoe-ps-mem-3 = <0x1b58>; + xlnx,tlzwe-ps-mem-0 = <0x88b8>; + xlnx,tlzwe-ps-mem-1 = <0x0>; + xlnx,tlzwe-ps-mem-2 = <0x0>; + xlnx,tlzwe-ps-mem-3 = <0x0>; + xlnx,tpacc-ps-flash-0 = <0x61a8>; + xlnx,tpacc-ps-flash-1 = <0x61a8>; + xlnx,tpacc-ps-flash-2 = <0x61a8>; + xlnx,tpacc-ps-flash-3 = <0x61a8>; + xlnx,twc-ps-mem-0 = <0x32c8>; + xlnx,twc-ps-mem-1 = <0x3a98>; + xlnx,twc-ps-mem-2 = <0x3a98>; + xlnx,twc-ps-mem-3 = <0x3a98>; + xlnx,twp-ps-mem-0 = <0x11170>; + xlnx,twp-ps-mem-1 = <0x2ee0>; + xlnx,twp-ps-mem-2 = <0x2ee0>; + xlnx,twp-ps-mem-3 = <0x2ee0>; + xlnx,twph-ps-mem-0 = <0x2ee0>; + xlnx,twph-ps-mem-1 = <0x2ee0>; + xlnx,twph-ps-mem-2 = <0x2ee0>; + xlnx,twph-ps-mem-3 = <0x2ee0>; } ; RS232_Uart_1: serial@40600000 { clock-frequency = <50000000>; @@ -293,7 +324,7 @@ current-speed = <9600>; device_type = "serial"; interrupt-parent = <µblaze_0_intc>; - interrupts = < 4 0 >; + interrupts = < 9 0 >; port-number = <0>; reg = < 0x40600000 0x10000 >; xlnx,baudrate = <0x2580>; @@ -303,11 +334,57 @@ xlnx,s-axi-aclk-freq-hz = <0x2faf080>; xlnx,use-parity = <0x0>; } ; + SysACE_CompactFlash: sysace@41800000 { + 8-bit ; + compatible = "xlnx,axi-sysace-1.01.a", "xlnx,xps-sysace-1.00.a"; + interrupt-parent = <µblaze_0_intc>; + interrupts = < 4 2 >; + reg = < 0x41800000 0x10000 >; + xlnx,family = "virtex6"; + xlnx,mem-width = <0x8>; + } ; + axi_ethernet_0: axi-ethernet@75440000 { + axistream-connected = <ÐERNET_dma>; + compatible = "xlnx,axi-ethernet-3.00.a", "xlnx,axi-ethernet-1.00.a"; + device_type = "network"; + interrupt-parent = <µblaze_0_intc>; + interrupts = < 2 2 >; + local-mac-address = [ 00 0a 35 d4 b9 00 ]; + phy-handle = <&phy0>; + reg = < 0x75440000 0x40000 >; + xlnx,avb = <0x0>; + xlnx,halfdup = <0x0>; + xlnx,include-io = <0x1>; + xlnx,mcast-extend = <0x0>; + xlnx,phy-type = <0x1>; + xlnx,phyaddr = "0B00001"; + xlnx,rxcsum = <0x2>; + xlnx,rxmem = <0x4000>; + xlnx,rxvlan-strp = <0x0>; + xlnx,rxvlan-tag = <0x0>; + xlnx,rxvlan-tran = <0x0>; + xlnx,stats = <0x0>; + xlnx,txcsum = <0x2>; + xlnx,txmem = <0x4000>; + xlnx,txvlan-strp = <0x0>; + xlnx,txvlan-tag = <0x0>; + xlnx,txvlan-tran = <0x0>; + xlnx,type = <0x2>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + phy0: phy@7 { + compatible = "marvell,88e1111"; + device_type = "ethernet-phy"; + reg = <7>; + } ; + } ; + } ; axi_timer_0: timer@41c00000 { clock-frequency = <50000000>; compatible = "xlnx,axi-timer-1.02.a", "xlnx,xps-timer-1.00.a"; interrupt-parent = <µblaze_0_intc>; - interrupts = < 2 2 >; + interrupts = < 3 2 >; reg = < 0x41c00000 0x10000 >; xlnx,count-width = <0x20>; xlnx,family = "virtex6"; @@ -331,8 +408,8 @@ compatible = "xlnx,axi-intc-1.01.a", "xlnx,xps-intc-1.00.a"; interrupt-controller ; reg = < 0x41200000 0x10000 >; - xlnx,kind-of-intr = <0x10>; - xlnx,num-intr-inputs = <0x5>; + xlnx,kind-of-intr = <0x200>; + xlnx,num-intr-inputs = <0xa>; } ; } ; } ; -- 2.11.4.GIT