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

Commit 33852cb0 authored by Seth Heasley's avatar Seth Heasley Committed by Jesse Barnes
Browse files

x86/PCI: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs 



This patch adds additional LPC Controller DeviceIDs for the Intel Cougar
Point PCH.

The DeviceIDs are defined and referenced as a range of values, the same
way Ibex Peak was implemented.

Signed-off-by: default avatarSeth Heasley <seth.heasley@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent caa5afbd

arch/x86/pci/irq.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -589,8 +589,6 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route 
	case PCI_DEVICE_ID_INTEL_ICH10_1:

	case PCI_DEVICE_ID_INTEL_ICH10_1:

	case PCI_DEVICE_ID_INTEL_ICH10_2:

	case PCI_DEVICE_ID_INTEL_ICH10_2:

	case PCI_DEVICE_ID_INTEL_ICH10_3:

	case PCI_DEVICE_ID_INTEL_ICH10_3:

	case PCI_DEVICE_ID_INTEL_CPT_LPC1:

	case PCI_DEVICE_ID_INTEL_CPT_LPC2:

		r->name = "PIIX/ICH";

		r->name = "PIIX/ICH";

		r->get = pirq_piix_get;

		r->get = pirq_piix_get;

		r->set = pirq_piix_set;

		r->set = pirq_piix_set;
@@ -605,6 +603,13 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route 
		return 1;

		return 1;

	}

	}





	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 

		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {

		r->name = "PIIX/ICH";

		r->get = pirq_piix_get;

		r->set = pirq_piix_set;

		return 1;

	}

	return 0;

	return 0;

}

}

include/linux/pci_ids.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -2419,8 +2419,8 @@ 
#define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30

#define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30

#define PCI_DEVICE_ID_INTEL_IOAT	0x1a38

#define PCI_DEVICE_ID_INTEL_IOAT	0x1a38

#define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22

#define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22

#define PCI_DEVICE_ID_INTEL_CPT_LPC1	0x1c42

#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41

#define PCI_DEVICE_ID_INTEL_CPT_LPC2	0x1c43

#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f

#define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410

#define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410

#define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411

#define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411

#define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413

#define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413