Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4d7510d authored by Jun Komuro's avatar Jun Komuro Committed by Linus Torvalds
Browse files

[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: default avatarJun Komuro <komurojun-mbn@nifty.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 22f3a8f5

drivers/net/pcmcia/fmvj18x_cs.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -435,7 +435,9 @@ static void fmvj18x_config(dev_link_t *link) 
		pcmcia_get_status(handle, &status);

		pcmcia_get_status(handle, &status);

		if (status.CardState & CS_EVENT_3VCARD)

		if (status.CardState & CS_EVENT_3VCARD)

		    link->conf.Vcc = 33; /* inserted in 3.3V slot */

		    link->conf.Vcc = 33; /* inserted in 3.3V slot */

	    } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410) {

	    } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410

			|| le16_to_cpu(buf[1]) == PRODID_TDK_NP9610

			|| le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) {

		/* MultiFunction Card */

		/* MultiFunction Card */

		link->conf.ConfigBase = 0x800;

		link->conf.ConfigBase = 0x800;

		link->conf.ConfigIndex = 0x47;

		link->conf.ConfigIndex = 0x47;
@@ -783,6 +785,8 @@ static struct pcmcia_device_id fmvj18x_ids[] = { 
	PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da),

	PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da),

	PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080),

	PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),

	PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a),

	PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),

	PCMCIA_DEVICE_NULL,

	PCMCIA_DEVICE_NULL,

};

};

MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids);

MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids);

drivers/serial/serial_cs.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -785,6 +785,8 @@ static struct pcmcia_device_id serial_ids[] = { 
	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),

	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),

	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),

	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),

	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),

	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),

	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),

include/pcmcia/ciscode.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,8 @@ 




#define MANFID_TDK			0x0105

#define MANFID_TDK			0x0105

#define PRODID_TDK_CF010		0x0900

#define PRODID_TDK_CF010		0x0900

#define PRODID_TDK_NP9610		0x0d0a

#define PRODID_TDK_MN3200		0x0e0a

#define PRODID_TDK_GN3410		0x4815

#define PRODID_TDK_GN3410		0x4815





#define MANFID_TOSHIBA			0x0098

#define MANFID_TOSHIBA			0x0098