pcnet_cs: add cis of KTI PE520 pcmcia network card

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

pcnet_cs,serial_cs:

add cis of KTI PE520 pcmcia network card,
and serial card(Sierra Wireless AC860).

Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Ken Kawasaki and committed by

David S. Miller 16 years ago abe88069 7ad6848c

+28 -4

5 changed files

expand all

drivers

net

pcmcia

pcnet_cs.c

serial

serial_cs.c

firmware

Makefile

WHENCE

cis

PE520.cis.ihex

+2 -2

drivers/net/pcmcia/pcnet_cs.c

··· 1741 1741 PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "cis/DP83903.cis"), 1742 1742 PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "cis/DP83903.cis"), 1743 1743 PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"), 1744 - PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"), 1744 + PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "cis/PE520.cis"), 1745 1745 PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"), 1746 1746 PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "cis/PE-200.cis"), 1747 1747 PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "cis/tamarack.cis"), ··· 1754 1754 MODULE_FIRMWARE("cis/PCMLM28.cis"); 1755 1755 MODULE_FIRMWARE("cis/DP83903.cis"); 1756 1756 MODULE_FIRMWARE("cis/LA-PCM.cis"); 1757 - MODULE_FIRMWARE("PE520.cis"); 1757 + MODULE_FIRMWARE("cis/PE520.cis"); 1758 1758 MODULE_FIRMWARE("cis/NE2K.cis"); 1759 1759 MODULE_FIRMWARE("cis/PE-200.cis"); 1760 1760 MODULE_FIRMWARE("cis/tamarack.cis");

+14 -1

drivers/serial/serial_cs.c

··· 819 819 PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "cis/3CXEM556.cis"), 820 820 PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "cis/3CXEM556.cis"), 821 821 PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */ 822 + PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC860", 0xd85f6206, 0x698f93db, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC860 3G Network Adapter R1 */ 822 823 PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC710/AC750", 0xd85f6206, 0x761b11e0, "cis/SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */ 823 824 PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "cis/SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */ 824 825 PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "cis/SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */ ··· 828 827 PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"), 829 828 PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"), 830 829 PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"), 831 - PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"), 830 + PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"), 832 831 PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b), 833 832 PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83), 834 833 PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232 1.00.",0x19ca78af,0x69fb7490), ··· 861 860 PCMCIA_DEVICE_NULL, 862 861 }; 863 862 MODULE_DEVICE_TABLE(pcmcia, serial_ids); 863 + 864 + MODULE_FIRMWARE("cis/PCMLM28.cis"); 865 + MODULE_FIRMWARE("cis/DP83903.cis"); 866 + MODULE_FIRMWARE("cis/3CCFEM556.cis"); 867 + MODULE_FIRMWARE("cis/3CXEM556.cis"); 868 + MODULE_FIRMWARE("cis/SW_8xx_SER.cis"); 869 + MODULE_FIRMWARE("cis/SW_7xx_SER.cis"); 870 + MODULE_FIRMWARE("cis/SW_555_SER.cis"); 871 + MODULE_FIRMWARE("cis/MT5634ZLX.cis"); 872 + MODULE_FIRMWARE("cis/COMpad2.cis"); 873 + MODULE_FIRMWARE("cis/COMpad4.cis"); 874 + MODULE_FIRMWARE("cis/RS-COM-2P.cis"); 864 875 865 876 static struct pcmcia_driver serial_cs_driver = { 866 877 .owner = THIS_MODULE,

+2 -1

firmware/Makefile

··· 69 69 fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin 70 70 fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \ 71 71 cis/DP83903.cis cis/NE2K.cis \ 72 - cis/tamarack.cis cis/PE-200.cis 72 + cis/tamarack.cis cis/PE-200.cis \ 73 + cis/PE520.cis 73 74 fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis 74 75 fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis 75 76 fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \

firmware/WHENCE

··· 601 601 cis/NE2K.cis 602 602 cis/tamarack.cis 603 603 cis/PE-200.cis 604 + cis/PE520.cis 604 605 605 606 Licence: GPL 606 607

firmware/cis/PE520.cis.ihex

··· 1 + :1000000001030000FF152304014B544900504535FE 2 + :10001000323020504C55530050434D434941204508 3 + :10002000746865726E65740000FF20046101100041 4 + :10003000210206001A050101D00F0B1B09C101198D 5 + :0A00400001556530FFFF1400FF00BA 6 + :00000001FF 7 + # 8 + # Replacement CIS for PE520 ethernet card 9 + #