Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 63ca2d74ea4f9c7a7ac082c915609a7b224908e7

Authored by Ken Kawasaki
Committed by David S. Miller
1 parent 207d6e8760

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

Showing 8 changed files with 60 additions and 7 deletions Side-by-side Diff

drivers/net/pcmcia/pcnet_cs.c
Diff comments   View file @ 63ca2d7
... ... @@ -1760,7 +1760,7 @@
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 1762 PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"),
1763   - PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),
  1763 + PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "cis/PE-200.cis"),
1764 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",
drivers/serial/serial_cs.c
Diff comments   View file @ 63ca2d7
... ... @@ -879,10 +879,10 @@
879 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   - PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G 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 */
885   - PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
  882 + PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */
  883 + PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC710/AC750", 0xd85f6206, 0x761b11e0, "cis/SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
  884 + PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "cis/SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
  885 + PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "cis/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 887 PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "cis/COMpad2.cis"),
888 888 PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"),
... ... @@ -69,11 +69,13 @@
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
  72 + cis/tamarack.cis cis/PE-200.cis
73 73 fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
74 74 fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
75 75 fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
76   - cis/COMpad2.cis cis/COMpad4.cis
  76 + cis/COMpad2.cis cis/COMpad4.cis \
  77 + cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
  78 + cis/SW_8xx_SER.cis
77 79 fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
78 80 fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
79 81 advansys/3550.bin advansys/38C0800.bin
... ... @@ -600,6 +600,7 @@
600 600 cis/DP83903.cis
601 601 cis/NE2K.cis
602 602 cis/tamarack.cis
  603 + cis/PE-200.cis
603 604  
604 605 Licence: GPL
605 606  
... ... @@ -633,6 +634,9 @@
633 634 cis/RS-COM-2P.cis
634 635 cis/COMpad2.cis
635 636 cis/COMpad4.cis
  637 + cis/SW_555_SER.cis
  638 + cis/SW_7xx_SER.cis
  639 + cis/SW_8xx_SER.cis
636 640  
637 641 Licence: GPL
638 642  
firmware/cis/PE-200.cis.ihex
Diff comments   View file @ 63ca2d7
  1 +:1000000001030000FF151E0401504D582020200060
  2 +:1000100050452D3230300045544845524E4554002D
  3 +:1000200052303100FF210206031A050101000101CF
  4 +:100030001B0EC181190155E051000F100F30FFFF59
  5 +:040040001400FF00A9
  6 +:00000001FF
  7 +#
  8 +# Replacement CIS for PE-200 ethernet card
  9 +#
firmware/cis/SW_555_SER.cis.ihex
Diff comments   View file @ 63ca2d7
  1 +:100000000101FF17034100FF20043F0110072102F7
  2 +:100010000200152A070053696572726120576972E0
  3 +:10002000656C657373004169724361726420353594
  4 +:1000300035004135353500526576203100FF1A050F
  5 +:1000400001030007731B0BE00118A360F8030730DE
  6 +:10005000BC3F1B08A10108A360F802071B08A2010E
  7 +:1000600008A360E803071B08A30108A360E80207D0
  8 +:0A0070001B04A40108231400FF0084
  9 +:00000001FF
  10 +#
  11 +# Replacement CIS for AC555 provided by Sierra Wireless
  12 +#
firmware/cis/SW_7xx_SER.cis.ihex
Diff comments   View file @ 63ca2d7
  1 +:100000000101FF17034100FF2004920110072102A4
  2 +:1000100002001537070053696572726120576972D3
  3 +:10002000656C6573730041433731302F4143373579
  4 +:10003000300047505253204E6574776F726B2041E9
  5 +:1000400064617074657200523100FF1A050103008B
  6 +:1000500007731B10E00119784D555D25A360F80367
  7 +:100060000730BC861B08A10108A360F802071B0823
  8 +:10007000A20108A360E803071B08A30108A360E826
  9 +:0C00800002071B04A40108231400FF0069
  10 +:00000001FF
  11 +#
  12 +# Replacement CIS for AC7xx provided by Sierra Wireless
  13 +#
firmware/cis/SW_8xx_SER.cis.ihex
Diff comments   View file @ 63ca2d7
  1 +:100000000101FF17034100FF2004920110072102A4
  2 +:100010000200152F070053696572726120576972DB
  3 +:10002000656C657373004143383530003347204EAB
  4 +:100030006574776F726B20416461707465720052F1
  5 +:100040003100FF1A0501030007731B10E001197846
  6 +:100050004D555D25A360F8480730BC861B08A101FB
  7 +:1000600008A360F847071B08A20108A360E8480737
  8 +:100070001B08A30108A360E847071B04A401082389
  9 +:040080001400FF0069
  10 +:00000001FF
  11 +#
  12 +# Replacement CIS for AC8xx provided by Sierra Wireless
  13 +#