Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63ca2d74 authored by Ken Kawasaki's avatar Ken Kawasaki Committed by David S. Miller
Browse files

pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card 



pcnet_cs,serial_cs:

add cis of PreMax ethernet pcmcia card,
and some Sierra Wireless serial card(AC555, AC7xx, AC8xx).

use PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.

Signed-off-by: default avatarKen Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 207d6e87

drivers/net/pcmcia/pcnet_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1760,7 +1760,7 @@ static struct pcmcia_device_id pcnet_ids[] = { 
	PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("PMX   ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("PMX   ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "cis/PE-200.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "cis/tamarack.cis"),

	PCMCIA_DEVICE_PROD_ID12("Ethernet", "CF Size PC Card", 0x00b2e941, 0x43ac239b),

	PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",

drivers/serial/serial_cs.c

+4 −4
Original line number Diff line number Diff line
@@ -879,10 +879,10 @@ static struct pcmcia_device_id serial_ids[] = { 
	PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "cis/DP83903.cis"),

	PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "cis/3CXEM556.cis"),

	PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "cis/3CXEM556.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "SW_8xx_SER.cis"),  /* Sierra Wireless AC850 3G Network Adapter R1 */

	PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"),	/* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */

	PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */

	PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */

	PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */

	PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC710/AC750", 0xd85f6206, 0x761b11e0, "cis/SW_7xx_SER.cis"),  /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */

	PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "cis/SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */

	PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "cis/SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */

	PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "cis/COMpad2.cis"),

	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"),

firmware/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -69,11 +69,13 @@ fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ 
fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin

fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \

				     cis/DP83903.cis cis/NE2K.cis \

				     cis/tamarack.cis

				     cis/tamarack.cis cis/PE-200.cis

fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis

fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis

fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \

				       cis/COMpad2.cis cis/COMpad4.cis

				       cis/COMpad2.cis cis/COMpad4.cis \

				       cis/SW_555_SER.cis cis/SW_7xx_SER.cis \

				       cis/SW_8xx_SER.cis

fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin

fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \

				      advansys/3550.bin advansys/38C0800.bin

firmware/WHENCE

+4 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ File: cis/LA-PCM.cis 
      cis/DP83903.cis

      cis/NE2K.cis

      cis/tamarack.cis

      cis/PE-200.cis



Licence: GPL
@@ -633,6 +634,9 @@ File: cis/MT5634ZLX.cis 
      cis/RS-COM-2P.cis

      cis/COMpad2.cis

      cis/COMpad4.cis

      cis/SW_555_SER.cis

      cis/SW_7xx_SER.cis

      cis/SW_8xx_SER.cis



Licence: GPL

firmware/cis/PE-200.cis.ihex

0 → 100644
+9 −0
Original line number Diff line number Diff line 
:1000000001030000FF151E0401504D582020200060

:1000100050452D3230300045544845524E4554002D

:1000200052303100FF210206031A050101000101CF

:100030001B0EC181190155E051000F100F30FFFF59

:040040001400FF00A9

:00000001FF

#

# Replacement CIS for PE-200 ethernet card

#