CIS source, Ralink firmware consolidation
The following changes since commit 82273130ddc0af5599b1138b07ebe6ceaabecb72:
linux-firmware: bnx2: Update firmware and version (2011-05-11 00:27:11 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware.git master
Ben Hutchings (3):
Add source and copyright notice for CIS files from pcmcia-cs
rt2860sta: Use latest firmware for RT3090
rt2870sta: Use latest firmware for RT3070 and RT3071
WHENCE | 39 +++++++++++++++++++++++++++++++++------ cis/src/3CCFEM556.cis | 22 ++++++++++++++++++++++ cis/src/3CXEM556.cis | 22 ++++++++++++++++++++++ cis/src/COMpad2.cis | 20 ++++++++++++++++++++ cis/src/COMpad4.cis | 14 ++++++++++++++ cis/src/DP83903.cis | 24 ++++++++++++++++++++++++ cis/src/LA-PCM.cis | 44 ++++++++++++++++++++++++++++++++++++++++++++ cis/src/MT5634ZLX.cis | 18 ++++++++++++++++++ cis/src/NE2K.cis | 10 ++++++++++ cis/src/PCMLM28.cis | 37 +++++++++++++++++++++++++++++++++++++ cis/src/PE-200.cis | 11 +++++++++++ cis/src/PE520.cis | 11 +++++++++++ cis/src/RS-COM-2P.cis | 14 ++++++++++++++ cis/src/tamarack.cis | 17 +++++++++++++++++ rt3070.bin | Bin 4096 -> 10 bytes rt3071.bin | Bin 4096 -> 4096 bytes rt3090.bin | Bin 8192 -> 10 bytes 17 files changed, 297 insertions(+), 6 deletions(-) create mode 100644 cis/src/3CCFEM556.cis create mode 100644 cis/src/3CXEM556.cis create mode 100644 cis/src/COMpad2.cis create mode 100644 cis/src/COMpad4.cis create mode 100644 cis/src/DP83903.cis create mode 100644 cis/src/LA-PCM.cis create mode 100644 cis/src/MT5634ZLX.cis create mode 100644 cis/src/NE2K.cis create mode 100644 cis/src/PCMLM28.cis create mode 100644 cis/src/PE-200.cis create mode 100644 cis/src/PE520.cis create mode 100644 cis/src/RS-COM-2P.cis create mode 100644 cis/src/tamarack.cis mode change 100644 => 120000 rt3070.bin mode change 100644 => 120000 rt3090.bin
Signature · 2 lines
Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
PATCH 1/3 Add source and copyright notice for CIS files from pcmcia-cs
The CIS files mostly come from pcmcia-cs releases, in which the source files were named etc/cis/*.cis and the binaries were named etc/cis/*.dat. However, the current drivers request the *binaries* as cis/*.cis. It's too late to fix that, so put the sources in a subdirectory here.
Signed-off-by Ben Hutchings <[email protected]>
--- WHENCE | 25 +++++++++++++++++++++---- cis/src/3CCFEM556.cis | 22 ++++++++++++++++++++++ cis/src/3CXEM556.cis | 22 ++++++++++++++++++++++ cis/src/COMpad2.cis | 20 ++++++++++++++++++++ cis/src/COMpad4.cis | 14 ++++++++++++++ cis/src/DP83903.cis | 24 ++++++++++++++++++++++++ cis/src/LA-PCM.cis | 44 ++++++++++++++++++++++++++++++++++++++++++++ cis/src/MT5634ZLX.cis | 18 ++++++++++++++++++ cis/src/NE2K.cis | 10 ++++++++++ cis/src/PCMLM28.cis | 37 +++++++++++++++++++++++++++++++++++++ cis/src/PE-200.cis | 11 +++++++++++ cis/src/PE520.cis | 11 +++++++++++ cis/src/RS-COM-2P.cis | 14 ++++++++++++++ cis/src/tamarack.cis | 17 +++++++++++++++++ 14 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 cis/src/3CCFEM556.cis create mode 100644 cis/src/3CXEM556.cis create mode 100644 cis/src/COMpad2.cis create mode 100644 cis/src/COMpad4.cis create mode 100644 cis/src/DP83903.cis create mode 100644 cis/src/LA-PCM.cis create mode 100644 cis/src/MT5634ZLX.cis create mode 100644 cis/src/NE2K.cis create mode 100644 cis/src/PCMLM28.cis create mode 100644 cis/src/PE-200.cis create mode 100644 cis/src/PE520.cis create mode 100644 cis/src/RS-COM-2P.cis create mode 100644 cis/src/tamarack.cis
WHENCE +21 -4
@@ -837,30 +837,42 @@ File: cis/NE2K.cis File: cis/tamarack.cis File: cis/PE-200.cis File: cis/PE520.cis +Source: cis/src/LA-PCM.cis +Source: cis/src/PCMLM28.cis +Source: cis/src/DP83903.cis +Source: cis/src/NE2K.cis +Source: cis/src/tamarack.cis +Source: cis/src/PE-200.cis +Source: cis/src/PE520.cis -Licence: GPL +Licence: Dual GPLv2/MPL Originally developed by the pcmcia-cs project +Copyright (C) 1998, 1999, 2000 David A. Hinds -------------------------------------------------------------------------- Driver: 3c589_cs - 3Com PCMCIA adapter File: cis/3CXEM556.cis +Source: cis/src/3CXEM556.cis -Licence: GPL +Licence: Dual GPLv2/MPL Originally developed by the pcmcia-cs project +Copyright (C) 1998, 1999, 2000 David A. Hinds -------------------------------------------------------------------------- Driver: 3c574_cs - 3Com PCMCIA adapter File: cis/3CCFEM556.cis +Source: cis/src/3CCFEM556.cis -Licence: GPL +Licence: Dual GPLv2/MPL Originally developed by the pcmcia-cs project +Copyright (C) 1998, 1999, 2000 David A. Hinds --------------------------------------------------------------------------
@@ -870,10 +882,15 @@ File: cis/MT5634ZLX.cis File: cis/RS-COM-2P.cis File: cis/COMpad2.cis File: cis/COMpad4.cis +Source: cis/src/MT5634ZLX.cis +Source: cis/src/RS-COM-2P.cis +Source: cis/src/COMpad2.cis +Source: cis/src/COMpad4.cis -Licence: GPL +Licence: Dual GPLv2/MPL Originally developed by the pcmcia-cs project +Copyright (C) 1998, 1999, 2000 David A. Hinds --------------------------------------------------------------------------
cis/src/3CCFEM556.cis new file +22 -0
@@ -0,0 +1,22 @@ +# +# This card is MFC-compliant, but identifies itself as single function +# +vers_1 5.0, "3Com", "Megahertz 3CCFEM556", "LAN + 56k Modem" +manfid 0x0101, 0x0556 +funcid 0 + +mfc { + funcid network_adapter + config base 0x1000 mask 0x267 last_index 0x07 + cftable_entry 0x07 + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x000f [8bit] [16bit] +}, { + funcid serial_port + config base 0x1100 mask 0x277 last_index 0x27 + cftable_entry 0x27 + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x0007 [8bit] +}
cis/src/3CXEM556.cis new file +22 -0
@@ -0,0 +1,22 @@ +# +# This card is MFC-compliant, but identifies itself as single function +# +vers_1 5.0, "3Com", "Megahertz 3CXEM556", "LAN + 56k Modem" +manfid 0x0101, 0x0035 +funcid 0 + +mfc { + funcid network_adapter + config base 0x0800 mask 0x63 last_index 0x07 + cftable_entry 0x07 + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x000f [8bit] [16bit] +}, { + funcid serial_port + config base 0x900 mask 0x63 last_index 0x27 + cftable_entry 0x27 + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x0007 [8bit] +}
cis/src/COMpad2.cis new file +20 -0
@@ -0,0 +1,20 @@ +# +# Replacement CIS for Advantech COMpad-32/85 +# +dev_info + NULL 0ns, 512b +vers_1 4.1, "ADVANTECH", "COMpad-32/85", "1.0" +funcid serial_port [post] +config base 0x0100 mask 0x0003 last_index 0x05 +cftable_entry 0x01 [default] + [mwait] + io 0x02e8-0x02ef, 0x03e8-0x03ef [lines=10] [8bit] [range] + irq mask 0x9eb8 [level] +cftable_entry 0x02 + io 0x0330-0x033f [lines=10] [8bit] [range] +cftable_entry 0x03 + io 0x0340-0x034f [lines=10] [8bit] [range] +cftable_entry 0x04 + io 0x0350-0x035f [lines=10] [8bit] [range] +cftable_entry 0x05 + io 0x0360-0x036f [lines=10] [8bit] [range]
cis/src/COMpad4.cis new file +14 -0
@@ -0,0 +1,14 @@ +# +# Replacement CIS for Advantech COMpad-32/85B-4 +# +dev_info + NULL 0ns, 512b +vers_1 4.1, "ADVANTECH", "COMpad-32/85B-4" +funcid serial_port [post] +config base 0x0100 mask 0x0001 last_index 0x02 +cftable_entry 0x01 [default] + [mwait] + io 0x0240-0x025f [lines=10] [8bit] [range] + irq mask 0x9eb8 [level] +cftable_entry 0x02 + io 0x0340-0x035f [lines=10] [8bit] [range]
cis/src/DP83903.cis new file +24 -0
@@ -0,0 +1,24 @@ +# +# This CIS is for cards based on the National Semiconductor +# DP83903 Multiple Function Interface Chip +# +vers_1 4.1, "Multifunction Card", "", "", "NSC MF LAN/Modem" +manfid 0x0175, 0x0000 +funcid 0 + +mfc { + funcid network_adapter + config base 0x1020 mask 0x277 last_index 0x17 + cftable_entry 0x17 + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x001f [8bit] [16bit] + memory 0x0000-0x3fff @ 0x0000 +}, { + funcid serial_port + config base 0x1040 mask 0x0277 last_index 0x07 + cftable_entry 0x07 + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x0007 [8bit] +}
cis/src/LA-PCM.cis new file +44 -0
44 lines not on this page · raw message
cis/src/MT5634ZLX.cis new file +18 -0
@@ -0,0 +1,18 @@ +# +# Replacement CIS for Multitech MT5634ZLX modems +# +dev_info no_info +vers_1 4.1, "MultiTech", "PCMCIA 56K DataFax" +manfid 0x0200, 0x0001 +funcid serial_port +config base 0xff80 mask 0x0067 last_index 0x27 +cftable_entry 0x0f [default] + [rdybsy] [audio] [pwrdown] + Vcc Vnom 5V Vpp1 Vnom 5V Vpp2 Vnom 5V + io 0x03f8-0x03ff [lines=10] [8bit] +cftable_entry 0x17 + io 0x02f8-0x02ff [lines=10] [8bit] +cftable_entry 0x1f + io 0x03e8-0x03ef [lines=10] [8bit] +cftable_entry 0x27 + io 0x02e8-0x02ef [lines=10] [8bit]
cis/src/NE2K.cis new file +10 -0
@@ -0,0 +1,10 @@ +# +# Replacement CIS for various busted NE2000-compatible cards +# +vers_1 4.1, "PCMCIA", "Ethernet" +funcid network_adapter +config base 0x03f8 mask 0x03 last_index 0x20 +cftable_entry 0x20 [default] + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x001f [8bit] [16bit]
cis/src/PCMLM28.cis new file +37 -0
@@ -0,0 +1,37 @@ +# +# The on-card CIS says it is MFC-compliant, but it is not +# +vers_1 4.1, "LINKSYS", "PCMLM28" +manfid 0x0143, 0xc0ab +funcid 0 +config base 0x03f8 mask 0x03 last_index 0x2f + +cftable_entry 0x24 [default] + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0300-0x031f, 0x02f8-0x02ff [8bit] [16bit] + +cftable_entry 0x25 + io 0x0320-0x033f, 0x02f8-0x02ff [8bit] [16bit] +cftable_entry 0x26 + io 0x0340-0x035f, 0x02f8-0x02ff [8bit] [16bit] +cftable_entry 0x27 + io 0x0360-0x037f, 0x02f8-0x02ff [8bit] [16bit] + +cftable_entry 0x28 + io 0x0300-0x031f, 0x03e8-0x03ef [8bit] [16bit] +cftable_entry 0x29 + io 0x0320-0x033f, 0x03e8-0x03ef [8bit] [16bit] +cftable_entry 0x2a + io 0x0340-0x035f, 0x03e8-0x03ef [8bit] [16bit] +cftable_entry 0x2b + io 0x0360-0x037f, 0x03e8-0x03ef [8bit] [16bit] + +cftable_entry 0x2c + io 0x0300-0x031f, 0x02e8-0x02ef [8bit] [16bit] +cftable_entry 0x2d + io 0x0320-0x033f, 0x02e8-0x02ef [8bit] [16bit] +cftable_entry 0x2e + io 0x0340-0x035f, 0x02e8-0x02ef [8bit] [16bit] +cftable_entry 0x2f + io 0x0360-0x037f, 0x02e8-0x02ef [8bit] [16bit]
cis/src/PE-200.cis new file +11 -0
@@ -0,0 +1,11 @@ +# +# Replacement CIS for PE-200 ethernet card +# +vers_1 4.1, "PMX ", "PE-200", "ETHERNET", "R01" +funcid network_adapter [post] [rom] +config base 0x0100 mask 0x0001 last_index 0x01 +cftable_entry 0x1 [default] + [mwait] + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x000f, 0x0010-0x001f [8bit] [16bit]
cis/src/PE520.cis new file +11 -0
@@ -0,0 +1,11 @@ +# +# Replacement CIS for LanPro EP-4000A ethernet card +# +vers_1 4.1, "KTI", "PE520 PLUS", "PCMCIA Ethernet" +manfid 0x0161, 0x0010 +funcid network_adapter +config base 0x0fd0 mask 0x0b last_index 0x01 +cftable_entry 0x01 [default] + Vcc Vnom 5V + irq mask 0xffff [level] + io 0x0000-0x001f [8bit] [16bit]
cis/src/RS-COM-2P.cis new file +14 -0
@@ -0,0 +1,14 @@ +# +# Replacement CIS for dual-serial-port IO card +# +vers_1 4.1, "PCMCIA", "RS-COM 2P" +funcid serial_port [post] +config base 0x0100 mask 0x0001 last_index 0x03 +cftable_entry 0x01 [default] + [mwait] + io 0x03e8-0x03ef, 0x02e8-0x02ef [lines=10] [8bit] [range] + irq mask 0x9eb8 [level] +cftable_entry 0x02 + io 0x0250-0x0257, 0x0258-0x025f [lines=10] [8bit] [range] +cftable_entry 0x03 + io 0x0260-0x0267, 0x0268-0x026f [lines=10] [8bit] [range]
cis/src/tamarack.cis new file +17 -0
@@ -0,0 +1,17 @@ +# +# Replacement CIS for Surecom, Tamarack NE2000 cards +# +dev_info + fn_specific 100ns, 512b +attr_dev_info + EEPROM 250ns, 512b +vers_1 4.1, "TAMARACK", "Ethernet", "A", "004743118001" +funcid network_adapter +config base 0x03f8 mask 0x0003 last_index 0x20 +cftable_entry 0x20 [default] + [mwait] + Vcc Vnom 5V Vmin 4500mV Vmax 5500mV Istatic 100mA + Iavg 170mA Ipeak 200mA + timing wait 15us + io 0x0000-0x000f, 0x0010-0x001f [lines=5] [8bit] [16bit] + irq mask 0xffff [level]
Signature · 1 line
1.7.5.1
PATCH 2/3 rt2860sta: Use latest firmware for RT3090
In reply to Ben HutchingsRalink's original drivers for RT2800P/RT2800E-family chips used multiple different versions of the firmware for different chips. The rt2860sta driver in staging was briefly converted to load different files for different chips. However, the current rt2860.bin is supposed to work on all of them, so replace rt3090.bin with a symlink.
Signed-off-by Ben Hutchings <[email protected]>
--- WHENCE | 2 +- rt3090.bin | Bin 8192 -> 10 bytes 2 files changed, 1 insertions(+), 1 deletions(-) mode change 100644 => 120000 rt3090.bin
WHENCE +1 -1
@@ -1113,7 +1113,7 @@ File: rt3090.bin Licence: Redistributable. See LICENCE.ralink-firmware.txt for details -Found in hex form in kernel source. +This is a link to rt2860.bin for compatibility. --------------------------------------------------------------------------
rt3090.bin deleted binary +0 -0
rt3090.bin new file +1 -0
@@ -0,0 +1 @@ +rt2860.bin
Signature · 1 line
1.7.5.1
PATCH 3/3 rt2870sta: Use latest firmware for RT3070 and RT3071
In reply to Ben HutchingsRalink's original drivers for RT2800U-family chips used multiple different versions of the firmware for different chips. The rt2870sta driver in staging was briefly converted to load different files for different chips. However, the current rt2870.bin provides 2 images that are supposed to cover all of them, so:
- Replace rt3070.bin with a symlink. The driver will use the first image and ignore the second.
- Replace rt3071.bin with a copy of the second image in the current rt2870.bin.
Signed-off-by Ben Hutchings <[email protected]>
--- WHENCE | 12 +++++++++++- rt3070.bin | Bin 4096 -> 10 bytes rt3071.bin | Bin 4096 -> 4096 bytes 3 files changed, 11 insertions(+), 1 deletions(-) mode change 100644 => 120000 rt3070.bin
WHENCE +11 -1
@@ -1120,12 +1120,22 @@ This is a link to rt2860.bin for compatibility. Driver: rt2800usb - Ralink RT2870, RT3070, RT3071, RT3072, RT5370 wireless MACs File: rt2870.bin + +Licence: Redistributable. See LICENCE.ralink-firmware.txt for details + +Binary file supplied by Shiang Tu <[email protected]>. Firmware Version 29 + +-------------------------------------------------------------------------- + +Driver: rt2870sta - Ralink RT2870, RT3070, RT3071 wireless MACs + File: rt3070.bin File: rt3071.bin Licence: Redistributable. See LICENCE.ralink-firmware.txt for details -Binary file supplied by Shiang Tu <[email protected]>. Firmware Version 29 +rt3070.bin is a link to rt2870.bin for compatibility. +rt3071.bin is a copy of bytes 4096-8191 of rt2870.bin for compatibility. --------------------------------------------------------------------------
rt3070.bin deleted binary +0 -0
rt3070.bin new file +1 -0
@@ -0,0 +1 @@ +rt2870.bin
rt3071.bin binary +0 -0
Signature · 1 line
1.7.5.1