diff options
author | Ken Kawasaki <ken_kawasaki@spring.nifty.jp> | 2009-09-15 05:42:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-15 05:42:25 -0400 |
commit | 531afd64d027e3d798c416b2b37b3cfb1de417d9 (patch) | |
tree | 112e6ad542a7e44fac465261afa693dcd95b8a8c | |
parent | 29a020d35f629619c67fa5e32acaaac3f8a1ba90 (diff) |
pcnet_cs: add cis of Linksys multifunction pcmcia card
pcnet_cs,serial_cs:
add cis of Linksys lan&modem mulitifunction pcmcia card
and some modem card(MT5634ZLX, RS-COM-2P).
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 10 | ||||
-rw-r--r-- | drivers/serial/serial_cs.c | 14 | ||||
-rw-r--r-- | firmware/Makefile | 3 | ||||
-rw-r--r-- | firmware/WHENCE | 12 | ||||
-rw-r--r-- | firmware/cis/MT5634ZLX.cis.ihex | 11 | ||||
-rw-r--r-- | firmware/cis/PCMLM28.cis.ihex | 18 | ||||
-rw-r--r-- | firmware/cis/RS-COM-2P.cis.ihex | 10 |
7 files changed, 65 insertions, 13 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 90a94d21583..97db1c73234 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -1750,11 +1750,11 @@ static struct pcmcia_device_id pcnet_ids[] = { | |||
1750 | PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078), | 1750 | PCMCIA_DEVICE_PROD_ID2("EN-6200P2", 0xa996d078), |
1751 | /* too generic! */ | 1751 | /* too generic! */ |
1752 | /* PCMCIA_DEVICE_PROD_ID12("PCMCIA", "10/100 Ethernet Card", 0x281f1c5d, 0x11b0ffc0), */ | 1752 | /* PCMCIA_DEVICE_PROD_ID12("PCMCIA", "10/100 Ethernet Card", 0x281f1c5d, 0x11b0ffc0), */ |
1753 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "PCMLM28.cis"), | 1753 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"), |
1754 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "PCMLM28.cis"), | 1754 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"), |
1755 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "PCMLM28.cis"), | 1755 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"), |
1756 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "PCMLM28.cis"), | 1756 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "cis/PCMLM28.cis"), |
1757 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "PCMLM28.cis"), | 1757 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "cis/PCMLM28.cis"), |
1758 | PCMCIA_MFC_DEVICE_CIS_PROD_ID12(0, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"), | 1758 | PCMCIA_MFC_DEVICE_CIS_PROD_ID12(0, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"), |
1759 | PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"), | 1759 | PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"), |
1760 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "DP83903.cis"), | 1760 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "DP83903.cis"), |
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 79c9c5f5cdb..ed4648b556c 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -868,11 +868,11 @@ static struct pcmcia_device_id serial_ids[] = { | |||
868 | PCMCIA_DEVICE_PROD_ID12("PCMCIA ", "C336MX ", 0x99bcafe9, 0xaa25bcab), | 868 | PCMCIA_DEVICE_PROD_ID12("PCMCIA ", "C336MX ", 0x99bcafe9, 0xaa25bcab), |
869 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f), | 869 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f), |
870 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d), | 870 | PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d), |
871 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "PCMLM28.cis"), | 871 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"), |
872 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "PCMLM28.cis"), | 872 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"), |
873 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "PCMLM28.cis"), | 873 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"), |
874 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "PCMLM28.cis"), | 874 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "cis/PCMLM28.cis"), |
875 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "PCMLM28.cis"), | 875 | PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "cis/PCMLM28.cis"), |
876 | PCMCIA_MFC_DEVICE_CIS_PROD_ID12(1, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"), | 876 | PCMCIA_MFC_DEVICE_CIS_PROD_ID12(1, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"), |
877 | PCMCIA_MFC_DEVICE_CIS_PROD_ID4(1, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"), | 877 | PCMCIA_MFC_DEVICE_CIS_PROD_ID4(1, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"), |
878 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0556, "cis/3CCFEM556.cis"), | 878 | PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0556, "cis/3CCFEM556.cis"), |
@@ -883,10 +883,10 @@ static struct pcmcia_device_id serial_ids[] = { | |||
883 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */ | 883 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */ |
884 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */ | 884 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */ |
885 | PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */ | 885 | PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */ |
886 | PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"), | 886 | PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"), |
887 | PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"), | 887 | PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"), |
888 | PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"), | 888 | PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"), |
889 | PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"), | 889 | PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"), |
890 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"), | 890 | PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"), |
891 | PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b), | 891 | PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b), |
892 | PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83), | 892 | PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83), |
diff --git a/firmware/Makefile b/firmware/Makefile index 878329cf482..ffe2663d49f 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -51,9 +51,10 @@ fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin | |||
51 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ | 51 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ |
52 | e100/d102e_ucode.bin | 52 | e100/d102e_ucode.bin |
53 | fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin | 53 | fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin |
54 | fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis | 54 | fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis |
55 | fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis | 55 | fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis |
56 | fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis | 56 | fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis |
57 | fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis | ||
57 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin | 58 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin |
58 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ | 59 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ |
59 | advansys/3550.bin advansys/38C0800.bin | 60 | advansys/3550.bin advansys/38C0800.bin |
diff --git a/firmware/WHENCE b/firmware/WHENCE index d9e3a94cb4d..82db5256a4e 100644 --- a/firmware/WHENCE +++ b/firmware/WHENCE | |||
@@ -596,6 +596,7 @@ Found in hex form in kernel source. | |||
596 | Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter | 596 | Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter |
597 | 597 | ||
598 | File: cis/LA-PCM.cis | 598 | File: cis/LA-PCM.cis |
599 | cis/PCMLM28.cis | ||
599 | 600 | ||
600 | Licence: GPL | 601 | Licence: GPL |
601 | 602 | ||
@@ -623,6 +624,17 @@ Originally developed by the pcmcia-cs project | |||
623 | 624 | ||
624 | -------------------------------------------------------------------------- | 625 | -------------------------------------------------------------------------- |
625 | 626 | ||
627 | Driver: SERIAL_8250_CS - Serial PCMCIA adapter | ||
628 | |||
629 | File: cis/MT5634ZLX.cis | ||
630 | cis/RS-COM-2P.cis | ||
631 | |||
632 | Licence: GPL | ||
633 | |||
634 | Originally developed by the pcmcia-cs project | ||
635 | |||
636 | -------------------------------------------------------------------------- | ||
637 | |||
626 | Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA | 638 | Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA |
627 | 639 | ||
628 | File: ositech/Xilinx7OD.bin | 640 | File: ositech/Xilinx7OD.bin |
diff --git a/firmware/cis/MT5634ZLX.cis.ihex b/firmware/cis/MT5634ZLX.cis.ihex new file mode 100644 index 00000000000..72500b9d95d --- /dev/null +++ b/firmware/cis/MT5634ZLX.cis.ihex | |||
@@ -0,0 +1,11 @@ | |||
1 | :100000000101FF152204014D756C74695465636824 | ||
2 | :100010000050434D4349412035364B2044617461C3 | ||
3 | :10002000466178000000FF20040002010021020266 | ||
4 | :10003000001A05012780FF671B0FCF418B01550177 | ||
5 | :10004000550155AA60F80307281B08970108AA6004 | ||
6 | :10005000F802071B089F0108AA60E803071B08A70E | ||
7 | :0B0060000108AA60E802071400FF007E | ||
8 | :00000001FF | ||
9 | # | ||
10 | # Replacement CIS for Multitech MT5634ZLX modems | ||
11 | # | ||
diff --git a/firmware/cis/PCMLM28.cis.ihex b/firmware/cis/PCMLM28.cis.ihex new file mode 100644 index 00000000000..ffdfe8522ef --- /dev/null +++ b/firmware/cis/PCMLM28.cis.ihex | |||
@@ -0,0 +1,18 @@ | |||
1 | :1000000001030000FF151504014C494E4B53595391 | ||
2 | :100010000050434D4C4D3238000000FF2004430196 | ||
3 | :10002000ABC0210200001A05012FF803031B10E4E6 | ||
4 | :1000300001190155E06100031FF8020730FFFF1BA3 | ||
5 | :100040000BA50108E06120031FF802071B0BA601A6 | ||
6 | :1000500008E06140031FF802071B0BA70108E061DD | ||
7 | :1000600060031FF802071B0BA80108E06100031FD3 | ||
8 | :10007000E803071B0BA90108E06120031FE8030741 | ||
9 | :100080001B0BAA0108E06140031FE803071B0BAB31 | ||
10 | :100090000108E06160031FE803071B0BAC0108E0E7 | ||
11 | :1000A0006100031FE802071B0BAD0108E06120039C | ||
12 | :1000B0001FE802071B0BAE0108E06140031FE802C6 | ||
13 | :1000C000071B0BAF0108E06160031FE80207140083 | ||
14 | :0200D000FF002F | ||
15 | :00000001FF | ||
16 | # | ||
17 | # The on-card CIS says it is MFC-compliant, but it is not | ||
18 | # | ||
diff --git a/firmware/cis/RS-COM-2P.cis.ihex b/firmware/cis/RS-COM-2P.cis.ihex new file mode 100644 index 00000000000..0801ca5da80 --- /dev/null +++ b/firmware/cis/RS-COM-2P.cis.ihex | |||
@@ -0,0 +1,10 @@ | |||
1 | :1000000001030000FF1516040150434D4349410010 | ||
2 | :1000100052532D434F4D203250000000FF21020269 | ||
3 | :10002000011A0501030001011B0EC18118AA61E834 | ||
4 | :100030000307E8020730B89E1B0B820108AA615033 | ||
5 | :1000400002075802071B0B830108AA6160020768B8 | ||
6 | :0600500002071400FF008E | ||
7 | :00000001FF | ||
8 | # | ||
9 | # Replacement CIS for dual-serial-port IO card | ||
10 | # | ||