2007-08-31 00:48:54

by Gaston, Jason D

[permalink] [raw]
Subject: [PATCH 2.6.23-rc4][RESEND] irq: irq and pci_ids patch for Intel Tolapai

Resend without wordwrap.

This updated patch adds the Intel Tolapai LPC and SMBus Controller DID's.

Signed-off-by: ?Jason Gaston <[email protected]>

--- linux-2.6.23-rc4/arch/i386/pci/irq.c.orig 2007-08-27 18:32:35.000000000 -0700
+++ linux-2.6.23-rc4/arch/i386/pci/irq.c 2007-08-28 16:58:31.000000000 -0700
@@ -550,6 +550,7 @@
case PCI_DEVICE_ID_INTEL_ICH9_3:
case PCI_DEVICE_ID_INTEL_ICH9_4:
case PCI_DEVICE_ID_INTEL_ICH9_5:
+ case PCI_DEVICE_ID_INTEL_Tolapai_0:
r->name = "PIIX/ICH";
r->get = pirq_piix_get;
r->set = pirq_piix_set;
--- linux-2.6.23-rc4/include/linux/pci_ids.h.orig 2007-08-27 18:32:35.000000000 -0700
+++ linux-2.6.23-rc4/include/linux/pci_ids.h 2007-08-28 16:58:31.000000000 -0700
@@ -2293,6 +2293,8 @@
#define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
#define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
#define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
+#define PCI_DEVICE_ID_INTEL_Tolapai_0 0x5031
+#define PCI_DEVICE_ID_INTEL_Tolapai_1 0x5032
#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
#define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020


2007-09-10 09:46:29

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH 2.6.23-rc4][RESEND] irq: irq and pci_ids patch for Intel Tolapai

On Thu, 30 Aug 2007 17:50:56 -0700 Jason Gaston <[email protected]> wrote:

> Resend without wordwrap.
>
> This updated patch adds the Intel Tolapai LPC and SMBus Controller DID's.
>
> Signed-off-by: ?Jason Gaston <[email protected]>
>
> --- linux-2.6.23-rc4/arch/i386/pci/irq.c.orig 2007-08-27 18:32:35.000000000 -0700
> +++ linux-2.6.23-rc4/arch/i386/pci/irq.c 2007-08-28 16:58:31.000000000 -0700
> @@ -550,6 +550,7 @@
> case PCI_DEVICE_ID_INTEL_ICH9_3:
> case PCI_DEVICE_ID_INTEL_ICH9_4:
> case PCI_DEVICE_ID_INTEL_ICH9_5:
> + case PCI_DEVICE_ID_INTEL_Tolapai_0:
> r->name = "PIIX/ICH";
> r->get = pirq_piix_get;
> r->set = pirq_piix_set;
> --- linux-2.6.23-rc4/include/linux/pci_ids.h.orig 2007-08-27 18:32:35.000000000 -0700
> +++ linux-2.6.23-rc4/include/linux/pci_ids.h 2007-08-28 16:58:31.000000000 -0700
> @@ -2293,6 +2293,8 @@
> #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
> #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
> #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
> +#define PCI_DEVICE_ID_INTEL_Tolapai_0 0x5031
> +#define PCI_DEVICE_ID_INTEL_Tolapai_1 0x5032
> #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
> #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
> #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020

I agree with Matthew that the lower-case shouldn't be in there, so I queued
a patch to fix that up.

Given that your I2C patch (and potentially others?) depend upon this one, I
shall plan on getting this patch into mainline this week to make everyone's
life simpler.

2007-09-10 19:41:18

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH 2.6.23-rc4][RESEND] irq: irq and pci_ids patch for Intel Tolapai

On Mon, Sep 10, 2007 at 02:45:25AM -0700, Andrew Morton wrote:
> On Thu, 30 Aug 2007 17:50:56 -0700 Jason Gaston <[email protected]> wrote:
>
> > Resend without wordwrap.
> >
> > This updated patch adds the Intel Tolapai LPC and SMBus Controller DID's.
> >
> > Signed-off-by: ?Jason Gaston <[email protected]>
> >
> > --- linux-2.6.23-rc4/arch/i386/pci/irq.c.orig 2007-08-27 18:32:35.000000000 -0700
> > +++ linux-2.6.23-rc4/arch/i386/pci/irq.c 2007-08-28 16:58:31.000000000 -0700
> > @@ -550,6 +550,7 @@
> > case PCI_DEVICE_ID_INTEL_ICH9_3:
> > case PCI_DEVICE_ID_INTEL_ICH9_4:
> > case PCI_DEVICE_ID_INTEL_ICH9_5:
> > + case PCI_DEVICE_ID_INTEL_Tolapai_0:
> > r->name = "PIIX/ICH";
> > r->get = pirq_piix_get;
> > r->set = pirq_piix_set;
> > --- linux-2.6.23-rc4/include/linux/pci_ids.h.orig 2007-08-27 18:32:35.000000000 -0700
> > +++ linux-2.6.23-rc4/include/linux/pci_ids.h 2007-08-28 16:58:31.000000000 -0700
> > @@ -2293,6 +2293,8 @@
> > #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
> > #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
> > #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
> > +#define PCI_DEVICE_ID_INTEL_Tolapai_0 0x5031
> > +#define PCI_DEVICE_ID_INTEL_Tolapai_1 0x5032
> > #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
> > #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
> > #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020
>
> I agree with Matthew that the lower-case shouldn't be in there, so I queued
> a patch to fix that up.
>
> Given that your I2C patch (and potentially others?) depend upon this one, I
> shall plan on getting this patch into mainline this week to make everyone's
> life simpler.

I agree, that's why it's in my queue to go to Linus in a day or so :)

thanks,

greg k-h

2007-09-10 19:49:18

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH 2.6.23-rc4][RESEND] irq: irq and pci_ids patch for Intel Tolapai

On Mon, 10 Sep 2007 07:09:13 -0700 Greg KH <[email protected]> wrote:

> On Mon, Sep 10, 2007 at 02:45:25AM -0700, Andrew Morton wrote:
> > On Thu, 30 Aug 2007 17:50:56 -0700 Jason Gaston <[email protected]> wrote:
> >
> > > Resend without wordwrap.
> > >
> > > This updated patch adds the Intel Tolapai LPC and SMBus Controller DID's.
> > >
> > > Signed-off-by: ?Jason Gaston <[email protected]>
> > >
> > > --- linux-2.6.23-rc4/arch/i386/pci/irq.c.orig 2007-08-27 18:32:35.000000000 -0700
> > > +++ linux-2.6.23-rc4/arch/i386/pci/irq.c 2007-08-28 16:58:31.000000000 -0700
> > > @@ -550,6 +550,7 @@
> > > case PCI_DEVICE_ID_INTEL_ICH9_3:
> > > case PCI_DEVICE_ID_INTEL_ICH9_4:
> > > case PCI_DEVICE_ID_INTEL_ICH9_5:
> > > + case PCI_DEVICE_ID_INTEL_Tolapai_0:
> > > r->name = "PIIX/ICH";
> > > r->get = pirq_piix_get;
> > > r->set = pirq_piix_set;
> > > --- linux-2.6.23-rc4/include/linux/pci_ids.h.orig 2007-08-27 18:32:35.000000000 -0700
> > > +++ linux-2.6.23-rc4/include/linux/pci_ids.h 2007-08-28 16:58:31.000000000 -0700
> > > @@ -2293,6 +2293,8 @@
> > > #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
> > > #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
> > > #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
> > > +#define PCI_DEVICE_ID_INTEL_Tolapai_0 0x5031
> > > +#define PCI_DEVICE_ID_INTEL_Tolapai_1 0x5032
> > > #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
> > > #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
> > > #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020
> >
> > I agree with Matthew that the lower-case shouldn't be in there, so I queued
> > a patch to fix that up.
> >
> > Given that your I2C patch (and potentially others?) depend upon this one, I
> > shall plan on getting this patch into mainline this week to make everyone's
> > life simpler.
>
> I agree, that's why it's in my queue to go to Linus in a day or so :)
>

I can't find it. Did you queue the all-caps version or the above version?

2007-09-11 06:41:27

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH 2.6.23-rc4][RESEND] irq: irq and pci_ids patch for Intel Tolapai

On Mon, Sep 10, 2007 at 12:48:41PM -0700, Andrew Morton wrote:
> On Mon, 10 Sep 2007 07:09:13 -0700 Greg KH <[email protected]> wrote:
>
> > On Mon, Sep 10, 2007 at 02:45:25AM -0700, Andrew Morton wrote:
> > > On Thu, 30 Aug 2007 17:50:56 -0700 Jason Gaston <[email protected]> wrote:
> > >
> > > > Resend without wordwrap.
> > > >
> > > > This updated patch adds the Intel Tolapai LPC and SMBus Controller DID's.
> > > >
> > > > Signed-off-by: ?Jason Gaston <[email protected]>
> > > >
> > > > --- linux-2.6.23-rc4/arch/i386/pci/irq.c.orig 2007-08-27 18:32:35.000000000 -0700
> > > > +++ linux-2.6.23-rc4/arch/i386/pci/irq.c 2007-08-28 16:58:31.000000000 -0700
> > > > @@ -550,6 +550,7 @@
> > > > case PCI_DEVICE_ID_INTEL_ICH9_3:
> > > > case PCI_DEVICE_ID_INTEL_ICH9_4:
> > > > case PCI_DEVICE_ID_INTEL_ICH9_5:
> > > > + case PCI_DEVICE_ID_INTEL_Tolapai_0:
> > > > r->name = "PIIX/ICH";
> > > > r->get = pirq_piix_get;
> > > > r->set = pirq_piix_set;
> > > > --- linux-2.6.23-rc4/include/linux/pci_ids.h.orig 2007-08-27 18:32:35.000000000 -0700
> > > > +++ linux-2.6.23-rc4/include/linux/pci_ids.h 2007-08-28 16:58:31.000000000 -0700
> > > > @@ -2293,6 +2293,8 @@
> > > > #define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
> > > > #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
> > > > #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
> > > > +#define PCI_DEVICE_ID_INTEL_Tolapai_0 0x5031
> > > > +#define PCI_DEVICE_ID_INTEL_Tolapai_1 0x5032
> > > > #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
> > > > #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
> > > > #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020
> > >
> > > I agree with Matthew that the lower-case shouldn't be in there, so I queued
> > > a patch to fix that up.
> > >
> > > Given that your I2C patch (and potentially others?) depend upon this one, I
> > > shall plan on getting this patch into mainline this week to make everyone's
> > > life simpler.
> >
> > I agree, that's why it's in my queue to go to Linus in a day or so :)
> >
>
> I can't find it. Did you queue the all-caps version or the above version?

The all-caps version. But I realized that I hadn't pushed out my tree
to kernel.org due to doing this work on the train without network
support, so it should be there now. Sorry about that.

greg k-h