Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit bf6fda63c452205f0e240ed8c511db5693857e93

Authored by Ken Kawasaki
Committed by David S. Miller
1 parent 9c501935a3
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia card 

pcnet_cs,serial_cs:

add cis of National Semicondoctor's lan&modem mulitifunction pcmcia card,
NE2K, tamarack ethernet card,
and some serial card(COMpad2, COMpad4).

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

Showing 9 changed files with 73 additions and 13 deletions Side-by-side Diff

drivers/net/pcmcia/pcnet_cs.c
Diff comments   View file @ bf6fda6
... ... @@ -1754,14 +1754,14 @@
1754 1754 PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"),
1755 1755 PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "cis/PCMLM28.cis"),
1756 1756 PCMCIA_PFC_DEVICE_CIS_PROD_ID12(0, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "cis/PCMLM28.cis"),
1757   - PCMCIA_MFC_DEVICE_CIS_PROD_ID12(0, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"),
1758   - PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"),
1759   - PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "DP83903.cis"),
  1757 + PCMCIA_MFC_DEVICE_CIS_PROD_ID12(0, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "cis/DP83903.cis"),
  1758 + PCMCIA_MFC_DEVICE_CIS_PROD_ID4(0, "NSC MF LAN/Modem", 0x58fc6056, "cis/DP83903.cis"),
  1759 + PCMCIA_MFC_DEVICE_CIS_MANF_CARD(0, 0x0175, 0x0000, "cis/DP83903.cis"),
1760 1760 PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"),
1761 1761 PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"),
1762   - PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "NE2K.cis"),
  1762 + PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"),
1763 1763 PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),
1764   - PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"),
  1764 + PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "cis/tamarack.cis"),
1765 1765 PCMCIA_DEVICE_PROD_ID12("Ethernet", "CF Size PC Card", 0x00b2e941, 0x43ac239b),
1766 1766 PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
1767 1767 0xb4be14e3, 0x43ac239b, 0x0877b627),
drivers/serial/serial_cs.c
Diff comments   View file @ bf6fda6
... ... @@ -873,10 +873,10 @@
873 873 PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"),
874 874 PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "cis/PCMLM28.cis"),
875 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"),
877   - PCMCIA_MFC_DEVICE_CIS_PROD_ID4(1, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"),
  876 + PCMCIA_MFC_DEVICE_CIS_PROD_ID12(1, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "cis/DP83903.cis"),
  877 + PCMCIA_MFC_DEVICE_CIS_PROD_ID4(1, "NSC MF LAN/Modem", 0x58fc6056, "cis/DP83903.cis"),
878 878 PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0556, "cis/3CCFEM556.cis"),
879   - PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "DP83903.cis"),
  879 + PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "cis/DP83903.cis"),
880 880 PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "cis/3CXEM556.cis"),
881 881 PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "cis/3CXEM556.cis"),
882 882 PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */
... ... @@ -884,9 +884,9 @@
884 884 PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
885 885 PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
886 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-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
888   - PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
889   - PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
  887 + PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "cis/COMpad2.cis"),
  888 + PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"),
  889 + PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
890 890 PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
891 891 PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),
892 892 PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
... ... @@ -67,10 +67,13 @@
67 67 fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
68 68 e100/d102e_ucode.bin
69 69 fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
70   -fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis
  70 +fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
  71 + cis/DP83903.cis cis/NE2K.cis \
  72 + cis/tamarack.cis
71 73 fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
72 74 fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
73   -fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis
  75 +fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
  76 + cis/COMpad2.cis cis/COMpad4.cis
74 77 fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
75 78 fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
76 79 advansys/3550.bin advansys/38C0800.bin
... ... @@ -597,6 +597,9 @@
597 597  
598 598 File: cis/LA-PCM.cis
599 599 cis/PCMLM28.cis
  600 + cis/DP83903.cis
  601 + cis/NE2K.cis
  602 + cis/tamarack.cis
600 603  
601 604 Licence: GPL
602 605  
... ... @@ -628,6 +631,8 @@
628 631  
629 632 File: cis/MT5634ZLX.cis
630 633 cis/RS-COM-2P.cis
  634 + cis/COMpad2.cis
  635 + cis/COMpad4.cis
631 636  
632 637 Licence: GPL
633 638  
firmware/cis/COMpad2.cis.ihex
Diff comments   View file @ bf6fda6
  1 +:1000000001030000FF151F0401414456414E5445B1
  2 +:10001000434800434F4D7061642D33322F38350013
  3 +:10002000312E300000FF210202011A0501050001F6
  4 +:10003000031B0EC18118AA61E80207E8030730B864
  5 +:100040009E1B08820108AA6030030F1B0883010869
  6 +:10005000AA6040030F1B08840108AA6050030F1B0D
  7 +:0D00600008850108AA6060030F1400FF006E
  8 +:00000001FF
  9 +#
  10 +# Replacement CIS for Advantech COMpad-32/85
  11 +#
firmware/cis/COMpad4.cis.ihex
Diff comments   View file @ bf6fda6
  1 +:1000000001030000FF151F0401414456414E5445B1
  2 +:10001000434800434F4D7061642D33322F383542D1
  3 +:100020002D34000000FF210202011A050102000127
  4 +:10003000011B0BC18118AA6040021F30B89E1B082B
  5 +:0C004000820108AA6040031F1400FF00AA
  6 +:00000001FF
  7 +#
  8 +# Replacement CIS for Advantech COMpad-32/85B-4
  9 +#
firmware/cis/DP83903.cis.ihex
Diff comments   View file @ bf6fda6
  1 +:1000000001030000FF152904014D756C74696675C4
  2 +:100010006E6374696F6E20436172640000004E531A
  3 +:1000200043204D46204C414E2F4D6F64656D00FFBF
  4 +:1000300020047501000021020000060B02004900A7
  5 +:100040000000006A000000FF00130343495321022F
  6 +:1000500006001A060517201077021B0C970179017C
  7 +:10006000556530FFFF284000FF001303434953212B
  8 +:100070000202001A060507401077021B09870119C2
  9 +:0800800001552330FFFFFF00D2
  10 +:00000001FF
  11 +#
  12 +# This CIS is for cards based on the National Semiconductor
  13 +# DP83903 Multiple Function Interface Chip
  14 +#
firmware/cis/NE2K.cis.ihex
Diff comments   View file @ bf6fda6
  1 +:1000000001030000FF1515040150434D4349410011
  2 +:1000100045746865726E6574000000FF2102060079
  3 +:100020001A050120F803031B09E001190155653089
  4 +:06003000FFFF1400FF00B9
  5 +:00000001FF
  6 +#
  7 +# Replacement CIS for various busted NE2000-compatible cards
  8 +#
firmware/cis/tamarack.cis.ihex
Diff comments   View file @ bf6fda6
  1 +:100000000103D400FF17034100FF152404015441EC
  2 +:100010004D415241434B0045746865726E657400F2
  3 +:10002000410030303437343331313830303100FF33
  4 +:10003000210206001A050120F803031B14E08119B0
  5 +:100040003F554D5D06864626E551000F100F30FFE7
  6 +:05005000FF1400FF0099
  7 +:00000001FF
  8 +#
  9 +# Replacement CIS for Surecom, Tamarack NE2000 cards
  10 +#