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

Commit 59e35ba1 authored by Alex Williamson's avatar Alex Williamson Committed by Dominik Brodowski
Browse files

[PATCH] pcmcia: TI PCIxx12 CardBus controller support 



The patch below adds support for the TI PCIxx12 CardBus controllers.
This seems to be sufficient to detect the cardbus bridge on an HP nc6320
and works with an orinoco wifi card.

Signed-off-by: default avatarAlex Williamson <alex.williamson@hp.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent c533120b

drivers/pcmcia/ti113x.h

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket) 
		 */

		break;



	case PCI_DEVICE_ID_TI_XX12:

	case PCI_DEVICE_ID_TI_X515:

	case PCI_DEVICE_ID_TI_X420:

	case PCI_DEVICE_ID_TI_X620:

drivers/pcmcia/yenta_socket.c

+1 −0
Original line number Diff line number Diff line
@@ -1312,6 +1312,7 @@ static struct pci_device_id yenta_table [] = { 


	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_XX12, 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),

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ 
#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_XX12		0x8039

#define PCI_DEVICE_ID_TI_1130		0xac12

#define PCI_DEVICE_ID_TI_1031		0xac13

#define PCI_DEVICE_ID_TI_1131		0xac15