tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] pcmcia: more IDs for TDK multifunction cards
Add new pcmcia id_table for fmvj18x_cs and serial_cs.
(TDK multi-function card (NetPartner9610 and MobileNetworker3200))
Signed-off-by: Jun Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
Jun Komuro
and committed by
Linus Torvalds
f4d7510d
22f3a8f5
+9
-1
+5
-1
drivers/net/pcmcia/fmvj18x_cs.c
+5
-1
drivers/net/pcmcia/fmvj18x_cs.c
···
435
435
pcmcia_get_status(handle, &status);
436
436
if (status.CardState & CS_EVENT_3VCARD)
437
437
link->conf.Vcc = 33; /* inserted in 3.3V slot */
438
-
} else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410) {
438
+
} else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410
439
+
|| le16_to_cpu(buf[1]) == PRODID_TDK_NP9610
440
+
|| le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) {
439
441
/* MultiFunction Card */
440
442
link->conf.ConfigBase = 0x800;
441
443
link->conf.ConfigIndex = 0x47;
···
785
783
PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da),
786
784
PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080),
787
785
PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
786
+
PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a),
787
+
PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),
788
788
PCMCIA_DEVICE_NULL,
789
789
};
790
790
MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids);
+2
drivers/serial/serial_cs.c
+2
drivers/serial/serial_cs.c
···
785
785
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),
786
786
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),
787
787
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),
788
+
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
789
+
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
788
790
PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),
789
791
PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),
790
792
PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),