[PATCH] yenta: add support for more TI bridges (6c1a10db) · Commits · 戴 / test

drivers/pcmcia/ti113x.h

+29 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@

		#define TI122X_SCR_SER_STEP 0xc0000000
		#define TI122X_SCR_INTRTIE 0x20000000
		#define TIXX21_SCR_TIEALL 0x10000000
		#define TI122X_SCR_CBRSVD 0x00400000
		#define TI122X_SCR_MRBURSTDN 0x00008000
		#define TI122X_SCR_MRBURSTUP 0x00004000
		@@ -624,6 +625,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
		int devfn;
		unsigned int state;
		int ret = 1;
		u32 sysctl;

		/* catch the two-slot controllers */
		switch (socket->dev->device) {
		@@ -646,6 +648,24 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
		*/
		break;

		case PCI_DEVICE_ID_TI_X515:
		case PCI_DEVICE_ID_TI_X420:
		case PCI_DEVICE_ID_TI_X620:
		case PCI_DEVICE_ID_TI_XX21_XX11:
		case PCI_DEVICE_ID_TI_7410:
		case PCI_DEVICE_ID_TI_7610:
		/*
		* those are either single or dual slot CB with additional functions
		* like 1394, smartcard reader, etc. check the TIEALL flag for them
		* the TIEALL flag binds the IRQ of all functions toghether.
		* we catch the single slot variants later.
		*/
		sysctl = config_readl(socket, TI113X_SYSTEM_CONTROL);
		if (sysctl & TIXX21_SCR_TIEALL)
		return 0;

		break;

		/* single-slot controllers have the 2nd slot empty always :) */
		default:
		return 1;
		@@ -658,6 +678,15 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
		if (!func)
		return 1;

		/*
		* check that the device id of both slots match. this is needed for the
		* XX21 and the XX11 controller that share the same device id for single
		* and dual slot controllers. return '2nd slot empty'. we already checked
		* if the interrupt is tied to another function.
		*/
		if (socket->dev->device != func->device)
		goto out;

		slot2 = pci_get_drvdata(func);
		if (!slot2)
		goto out;

drivers/pcmcia/yenta_socket.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1249,6 +1249,14 @@ static struct pci_device_id yenta_table [] = {
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1250, TI1250),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1410, TI1250),

		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11, TI12XX),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X515, TI12XX),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X420, TI12XX),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_X620, TI12XX),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7410, TI12XX),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7510, TI12XX),
		CB_ID(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_7610, TI12XX),

		CB_ID(PCI_VENDOR_ID_ENE, PCI_DEVICE_ID_ENE_1211, ENE),
		CB_ID(PCI_VENDOR_ID_ENE, PCI_DEVICE_ID_ENE_1225, ENE),
		CB_ID(PCI_VENDOR_ID_ENE, PCI_DEVICE_ID_ENE_1410, ENE),

include/linux/pci_ids.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -769,6 +769,8 @@
		#define PCI_DEVICE_ID_TI_TVP4010 0x3d04
		#define PCI_DEVICE_ID_TI_TVP4020 0x3d07
		#define PCI_DEVICE_ID_TI_4450 0x8011
		#define PCI_DEVICE_ID_TI_XX21_XX11 0x8031
		#define PCI_DEVICE_ID_TI_X515 0x8036
		#define PCI_DEVICE_ID_TI_1130 0xac12
		#define PCI_DEVICE_ID_TI_1031 0xac13
		#define PCI_DEVICE_ID_TI_1131 0xac15
		@@ -785,12 +787,17 @@
		#define PCI_DEVICE_ID_TI_4451 0xac42
		#define PCI_DEVICE_ID_TI_4510 0xac44
		#define PCI_DEVICE_ID_TI_4520 0xac46
		#define PCI_DEVICE_ID_TI_7510 0xac47
		#define PCI_DEVICE_ID_TI_7610 0xac48
		#define PCI_DEVICE_ID_TI_7410 0xac49
		#define PCI_DEVICE_ID_TI_1410 0xac50
		#define PCI_DEVICE_ID_TI_1420 0xac51
		#define PCI_DEVICE_ID_TI_1451A 0xac52
		#define PCI_DEVICE_ID_TI_1620 0xac54
		#define PCI_DEVICE_ID_TI_1520 0xac55
		#define PCI_DEVICE_ID_TI_1510 0xac56
		#define PCI_DEVICE_ID_TI_X620 0xac8d
		#define PCI_DEVICE_ID_TI_X420 0xac8e

		#define PCI_VENDOR_ID_SONY 0x104d
		#define PCI_DEVICE_ID_SONY_CXD3222 0x8039

Admin message