lpc: irq and pci_ids patch for Intel Panther Point DeviceIDs

PATCH Applied Seth Heasley 3 participants 3 messages Apr 19, 2011 – Apr 20, 2011

lore

Share & tools

lore

Seth Heasley

author

2011-04-19 23:43 UTC #0 lore raw

PATCH 1/1 lpc: irq and pci_ids patch for Intel Panther Point DeviceIDs

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

Signed-off-by Seth Heasley <[email protected]>

--- linux-2.6.39-rc3/include/linux/pci_ids.h.orig 2011-04-11
17:21:51.000000000 -0700
+++ linux-2.6.39-rc3/include/linux/pci_ids.h 2011-03-29 15:55:13.000000000
-0700
@@ -2480,6 +2480,9 @@
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS 0x1e22
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN 0x1e40
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX 0x1e5f
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0 0x1d40
#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1 0x1d41
--- linux-2.6.39-rc3/arch/x86/pci/irq.c.orig 2011-04-11 17:21:51.000000000
-0700
+++ linux-2.6.39-rc3/arch/x86/pci/irq.c 2011-04-14 12:15:47.000000000 -0700
@@ -602,7 +602,9 @@
|| (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN &&
device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)

 	||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
-	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
+	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
+	||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
+	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {

r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;

Jean Delvare

Acked-by on v1 1/1

2011-04-20 07:56 UTC #1 lore raw

Quoted 3 lines · Seth Heasley

This patch adds the LPC Controller DeviceIDs for the Intel Panther Point PCH.
Signed-off-by Seth Heasley <[email protected]>

Acked-by Jean Delvare <[email protected]>

Quoted 29 lines

--- linux-2.6.39-rc3/include/linux/pci_ids.h.orig 2011-04-11
17:21:51.000000000 -0700
+++ linux-2.6.39-rc3/include/linux/pci_ids.h 2011-03-29 15:55:13.000000000
-0700

(quoted diff) +7 -3

@@ -2480,6 +2480,9 @@
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS	0x1c22
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN	0x1c41
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS	0x1e22
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN	0x1e40
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX	0x1e5f
 #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS	0x1d22
 #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0	0x1d40
 #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1	0x1d41
--- linux-2.6.39-rc3/arch/x86/pci/irq.c.orig	2011-04-11 17:21:51.000000000 
-0700
+++ linux-2.6.39-rc3/arch/x86/pci/irq.c	2011-04-14 12:15:47.000000000 -0700

@@ -602,7 +602,9 @@
 	||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 
 	     device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
 	||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
-	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
+	     device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
+	||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
+	     device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;

Signature · 1 line

Jean Delvare

Jesse Barnes

Applied

2011-04-20 15:13 UTC #2 lore raw

In reply to Seth Heasley

Quoted 3 lines · On Tue, 19 Apr 2011 16:35:15 -0700 Seth Heasley <[email protected]> wrote:

This patch adds the LPC Controller DeviceIDs for the Intel Panther Point PCH.
Signed-off-by Seth Heasley <[email protected]>

Applied to linux-next, thanks.

Signature · 1 line

Jesse Barnes, Intel Open Source Technology Center