linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel
@ 2010-09-24 23:06 Seth Heasley
       [not found] ` <201009241606.11840.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
  2010-10-04 20:27 ` [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg Seth Heasley
  0 siblings, 2 replies; 7+ messages in thread
From: Seth Heasley @ 2010-09-24 23:06 UTC (permalink / raw)
  To: jbarnes-Y1mF5jBUw70BENJcbMCuUQ, khali-PUYAD+kWke1g9hUCZPvPmw,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-pci-u79uwXL29TY76Z2rM5mHXA,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA,
	seth.heasley-ral2JQCrhuEAvxtiuMwx3w

>> Could Intel please stop using abbreviations for their chip names? If
>> the chip is named Patsburg then please use PATSBURG in the symbol
>names
>> too. MRST, PGB, etc. make me sick.
>
>Agreed.  Do you want to submit a rename patch for the existing stuff?
>You can do it on top of this one if you like, I'll put it into
>linux-next.
>
>I guess this means more typing for you in future patches, Seth. :)
>
>Thanks,
>--
>Jesse Barnes, Intel Open Source Technology Center

Jesse,

I renamed some of the recent symbols, others to be renamed later on.  This patch was built against the previous changes.  

Jean,

Also included in the patch are changes to drivers/i2c/busses/i2c-i801.c, as the updated symbols are referenced there.  

Regards,
-Seth
-------------

This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.

Signed-off-by: Seth Heasley <seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

--- linux-2.6.35.4/include/linux/pci_ids.h.orig	2010-08-26 16:47:12.000000000 -0700
+++ linux-2.6.35.4/include/linux/pci_ids.h	2010-09-24 13:56:47.000000000 -0700
@@ -2420,9 +2420,10 @@
 #define PCI_DEVICE_ID_INTEL_82840_HB	0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
-#define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#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_PATSBURG_LPC	0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
@@ -2628,9 +2629,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN	0x3b00
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX	0x3b1f
-#define PCI_DEVICE_ID_INTEL_PCH_SMBUS	0x3b30
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN	0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
@@ -2639,8 +2640,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_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
--- linux-2.6.35.4/arch/x86/pci/irq.c.orig	2010-09-24 13:59:39.000000000 -0700
+++ linux-2.6.35.4/arch/x86/pci/irq.c	2010-09-24 14:02:07.000000000 -0700
@@ -584,28 +584,28 @@
 	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:
+	case PCI_DEVICE_ID_INTEL_EP80579_0:
 	case PCI_DEVICE_ID_INTEL_ICH10_0:
 	case PCI_DEVICE_ID_INTEL_ICH10_1:
 	case PCI_DEVICE_ID_INTEL_ICH10_2:
 	case PCI_DEVICE_ID_INTEL_ICH10_3:
-	case PCI_DEVICE_ID_INTEL_PBG_LPC:
+	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
 		return 1;
 	}
 
-	if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
-		(device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
 		return 1;
 	}
 
-	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
-		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
--- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig	2010-09-24 14:59:23.000000000 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig	2010-09-24 14:59:42.000000000 -0700
@@ -95,7 +95,7 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579
 	    ICH10
 	    3400/5 Series (PCH)
 	    Cougar Point (PCH)
--- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig	2010-09-24 14:57:55.000000000 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c	2010-09-24 14:59:13.000000000 -0700
@@ -38,7 +38,7 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     yes     yes
+  EP80579               0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
   3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
@@ -587,11 +587,11 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
 	{ 0, }
 };
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel
       [not found] ` <201009241606.11840.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
@ 2010-09-25 11:30   ` Jean Delvare
       [not found]     ` <20100925133039.75e9ac71-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
  0 siblings, 1 reply; 7+ messages in thread
From: Jean Delvare @ 2010-09-25 11:30 UTC (permalink / raw)
  To: Seth Heasley
  Cc: jbarnes-Y1mF5jBUw70BENJcbMCuUQ,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-pci-u79uwXL29TY76Z2rM5mHXA,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA

On Fri, 24 Sep 2010 16:06:11 -0700, Seth Heasley wrote:
> >> Could Intel please stop using abbreviations for their chip names? If
> >> the chip is named Patsburg then please use PATSBURG in the symbol
> >names
> >> too. MRST, PGB, etc. make me sick.
> >
> >Agreed.  Do you want to submit a rename patch for the existing stuff?
> >You can do it on top of this one if you like, I'll put it into
> >linux-next.
> >
> >I guess this means more typing for you in future patches, Seth. :)
> >
> >Thanks,
> >--
> >Jesse Barnes, Intel Open Source Technology Center
> 
> Jesse,
> 
> I renamed some of the recent symbols, others to be renamed later on.  This patch was built against the previous changes.  
> 
> Jean,
> 
> Also included in the patch are changes to drivers/i2c/busses/i2c-i801.c, as the updated symbols are referenced there.  
> 
> Regards,
> -Seth
> -------------
> 
> This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
> 
> Signed-off-by: Seth Heasley <seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> 
> --- linux-2.6.35.4/include/linux/pci_ids.h.orig	2010-08-26 16:47:12.000000000 -0700
> +++ linux-2.6.35.4/include/linux/pci_ids.h	2010-09-24 13:56:47.000000000 -0700
> @@ -2420,9 +2420,10 @@
>  #define PCI_DEVICE_ID_INTEL_82840_HB	0x1a21
>  #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
>  #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
> -#define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
> -#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
> -#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
> +#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_PATSBURG_LPC	0x1d40
>  #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
>  #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
>  #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
> @@ -2628,9 +2629,9 @@
>  #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
>  #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
>  #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
> -#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN	0x3b00
> -#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX	0x3b1f
> -#define PCI_DEVICE_ID_INTEL_PCH_SMBUS	0x3b30
> +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN	0x3b00
> +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
> +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
>  #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
>  #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
> @@ -2639,8 +2640,8 @@
>  #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
>  #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
>  #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
> -#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
> -#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
> +#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
> +#define PCI_DEVICE_ID_INTEL_EP80579_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
> --- linux-2.6.35.4/arch/x86/pci/irq.c.orig	2010-09-24 13:59:39.000000000 -0700
> +++ linux-2.6.35.4/arch/x86/pci/irq.c	2010-09-24 14:02:07.000000000 -0700
> @@ -584,28 +584,28 @@
>  	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:
> +	case PCI_DEVICE_ID_INTEL_EP80579_0:
>  	case PCI_DEVICE_ID_INTEL_ICH10_0:
>  	case PCI_DEVICE_ID_INTEL_ICH10_1:
>  	case PCI_DEVICE_ID_INTEL_ICH10_2:
>  	case PCI_DEVICE_ID_INTEL_ICH10_3:
> -	case PCI_DEVICE_ID_INTEL_PBG_LPC:
> +	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
>  		r->name = "PIIX/ICH";
>  		r->get = pirq_piix_get;
>  		r->set = pirq_piix_set;
>  		return 1;
>  	}
>  
> -	if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
> -		(device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
> +	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
> +		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
>  		r->name = "PIIX/ICH";
>  		r->get = pirq_piix_get;
>  		r->set = pirq_piix_set;
>  		return 1;
>  	}
>  
> -	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
> -		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
> +	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
> +		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
>  		r->name = "PIIX/ICH";
>  		r->get = pirq_piix_get;
>  		r->set = pirq_piix_set;
> --- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig	2010-09-24 14:59:23.000000000 -0700
> +++ linux-2.6.35.4/drivers/i2c/busses/Kconfig	2010-09-24 14:59:42.000000000 -0700
> @@ -95,7 +95,7 @@
>  	    ESB2
>  	    ICH8
>  	    ICH9
> -	    Tolapai
> +	    EP80579
>  	    ICH10
>  	    3400/5 Series (PCH)

How did this become "5_3400_SERIES" in the symbol names? Shouldn't it
be 3400_5_SERIES instead?

>  	    Cougar Point (PCH)
> --- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig	2010-09-24 14:57:55.000000000 -0700
> +++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c	2010-09-24 14:59:13.000000000 -0700
> @@ -38,7 +38,7 @@
>    82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
>    82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
>    82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
> -  Tolapai               0x5032     32     hard     yes     yes     yes
> +  EP80579               0x5032     32     hard     yes     yes     yes

Maybe keep "Tolapai" inside parentheses, as people may know the
platform by that name by now?

>    ICH10                 0x3a30     32     hard     yes     yes     yes
>    ICH10                 0x3a60     32     hard     yes     yes     yes
>    3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
> @@ -587,11 +587,11 @@
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
> -	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
> -	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
> -	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
>  	{ 0, }
>  };

Other than these minor details, I'm very happy with this change:

Acked-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>

-- 
Jean Delvare

^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel
       [not found]     ` <20100925133039.75e9ac71-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
@ 2010-09-25 15:13       ` Heasley, Seth
  0 siblings, 0 replies; 7+ messages in thread
From: Heasley, Seth @ 2010-09-25 15:13 UTC (permalink / raw)
  To: Jean Delvare
  Cc: jbarnes-Y1mF5jBUw70BENJcbMCuUQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

>> --- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig	2010-09-24
>14:59:23.000000000 -0700
>> +++ linux-2.6.35.4/drivers/i2c/busses/Kconfig	2010-09-24
>14:59:42.000000000 -0700
>> @@ -95,7 +95,7 @@
>>  	    ESB2
>>  	    ICH8
>>  	    ICH9
>> -	    Tolapai
>> +	    EP80579
>>  	    ICH10
>>  	    3400/5 Series (PCH)
>
>How did this become "5_3400_SERIES" in the symbol names? Shouldn't it
>be 3400_5_SERIES instead?

The way I did it here is consistent with the approved branding submitted for pci.ids.  So perhaps changing the 3400/5 Series to "5 Series/3400 Series" would make sense.

>
>>  	    Cougar Point (PCH)
>> --- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig	2010-09-24
>14:57:55.000000000 -0700
>> +++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c	2010-09-24
>14:59:13.000000000 -0700
>> @@ -38,7 +38,7 @@
>>    82801G   (ICH7)       0x27da     32     hard     yes     yes
>yes
>>    82801H   (ICH8)       0x283e     32     hard     yes     yes
>yes
>>    82801I   (ICH9)       0x2930     32     hard     yes     yes
>yes
>> -  Tolapai               0x5032     32     hard     yes     yes
>yes
>> +  EP80579               0x5032     32     hard     yes     yes
>yes
>
>Maybe keep "Tolapai" inside parentheses, as people may know the
>platform by that name by now?

That'd be fine with me.

-Seth

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg
  2010-09-24 23:06 [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Seth Heasley
       [not found] ` <201009241606.11840.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
@ 2010-10-04 20:27 ` Seth Heasley
  2010-10-05  6:57   ` Jean Delvare
       [not found]   ` <201010041327.15170.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
  1 sibling, 2 replies; 7+ messages in thread
From: Seth Heasley @ 2010-10-04 20:27 UTC (permalink / raw)
  To: jbarnes; +Cc: khali, linux-kernel, linux-pci, linux-i2c, seth.heasley

>> --- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig   2010-09-24
>14:59:23.000000000 -0700
>> +++ linux-2.6.35.4/drivers/i2c/busses/Kconfig        2010-09-24
>14:59:42.000000000 -0700
>> @@ -95,7 +95,7 @@
>>          ESB2
>>          ICH8
>>          ICH9
>> -        Tolapai
>> +        EP80579
>>          ICH10
>>          3400/5 Series (PCH)
>
>How did this become "5_3400_SERIES" in the symbol names? Shouldn't it
>be 3400_5_SERIES instead?

The approved branding in pci.ids is 5/3400 Series, so I wanted to reflect that here.  I've changed it in Kconfig as well as i2c-i801.c to be consistent.

>> --- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig        2010-09-24
>14:57:55.000000000 -0700
>> +++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c     2010-09-24
>14:59:13.000000000 -0700
>> @@ -38,7 +38,7 @@
>>    82801G   (ICH7)       0x27da     32     hard     yes     yes
>yes
>>    82801H   (ICH8)       0x283e     32     hard     yes     yes
>yes
>>    82801I   (ICH9)       0x2930     32     hard     yes     yes
>yes
>> -  Tolapai               0x5032     32     hard     yes     yes
>yes
>> +  EP80579               0x5032     32     hard     yes     yes
>yes
>
>Maybe keep "Tolapai" inside parentheses, as people may know the
>platform by that name by now?

Agreed.  I've updated that in both places it's referenced.  Final (hopefully) patch below:

This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
 
Signed-off-by: Seth Heasley <seth.heasley@intel.com>

--- linux-2.6.35.4/include/linux/pci_ids.h.orig	2010-08-26 16:47:12.000000000 -0700
+++ linux-2.6.35.4/include/linux/pci_ids.h	2010-09-24 13:56:47.000000000 -0700
@@ -2420,9 +2420,10 @@
 #define PCI_DEVICE_ID_INTEL_82840_HB	0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
-#define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
+#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_PATSBURG_LPC	0x1d40
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
 #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
 #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
@@ -2628,9 +2629,9 @@
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN	0x3b00
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX	0x3b1f
-#define PCI_DEVICE_ID_INTEL_PCH_SMBUS	0x3b30
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN	0x3b00
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
@@ -2639,8 +2640,8 @@
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
-#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
+#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
+#define PCI_DEVICE_ID_INTEL_EP80579_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
--- linux-2.6.35.4/arch/x86/pci/irq.c.orig	2010-09-24 13:59:39.000000000 -0700
+++ linux-2.6.35.4/arch/x86/pci/irq.c	2010-09-24 14:02:07.000000000 -0700
@@ -584,28 +584,28 @@
 	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:
+	case PCI_DEVICE_ID_INTEL_EP80579_0:
 	case PCI_DEVICE_ID_INTEL_ICH10_0:
 	case PCI_DEVICE_ID_INTEL_ICH10_1:
 	case PCI_DEVICE_ID_INTEL_ICH10_2:
 	case PCI_DEVICE_ID_INTEL_ICH10_3:
-	case PCI_DEVICE_ID_INTEL_PBG_LPC:
+	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
 		return 1;
 	}
 
-	if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
-		(device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
 		return 1;
 	}
 
-	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
-		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
+	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
+		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
 		r->name = "PIIX/ICH";
 		r->get = pirq_piix_get;
 		r->set = pirq_piix_set;
--- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig	2010-09-24 14:59:23.000000000 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig	2010-10-04 13:10:44.000000000 -0700
@@ -95,9 +95,9 @@
 	    ESB2
 	    ICH8
 	    ICH9
-	    Tolapai
+	    EP80579 (Tolapai)
 	    ICH10
-	    3400/5 Series (PCH)
+	    5/3400 Series (PCH)
 	    Cougar Point (PCH)
 
 	  This driver can also be built as a module.  If so, the module
--- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig	2010-09-24 14:57:55.000000000 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c	2010-10-04 13:12:00.000000000 -0700
@@ -38,10 +38,10 @@
   82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
   82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
   82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
-  Tolapai               0x5032     32     hard     yes     yes     yes
+  EP80579 (Tolapai)     0x5032     32     hard     yes     yes     yes
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
-  3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
+  5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
   Cougar Point (PCH)    0x1c22     32     hard     yes     yes     yes
 
   Features supported by this driver:
@@ -587,11 +587,11 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
 	{ 0, }
 };
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg
  2010-10-04 20:27 ` [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg Seth Heasley
@ 2010-10-05  6:57   ` Jean Delvare
       [not found]   ` <201010041327.15170.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
  1 sibling, 0 replies; 7+ messages in thread
From: Jean Delvare @ 2010-10-05  6:57 UTC (permalink / raw)
  To: Seth Heasley; +Cc: jbarnes, linux-kernel, linux-pci, linux-i2c

On Mon, 4 Oct 2010 13:27:14 -0700, Seth Heasley wrote:
> Agreed.  I've updated that in both places it's referenced.  Final (hopefully) patch below:
> 
> This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
>  
> Signed-off-by: Seth Heasley <seth.heasley@intel.com>

Thanks a lot for doing this.

Acked-by: Jean Delvare <khali@linux-fr.org>

> 
> --- linux-2.6.35.4/include/linux/pci_ids.h.orig	2010-08-26 16:47:12.000000000 -0700
> +++ linux-2.6.35.4/include/linux/pci_ids.h	2010-09-24 13:56:47.000000000 -0700
> @@ -2420,9 +2420,10 @@
>  #define PCI_DEVICE_ID_INTEL_82840_HB	0x1a21
>  #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
>  #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
> -#define PCI_DEVICE_ID_INTEL_CPT_SMBUS	0x1c22
> -#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN	0x1c41
> -#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX	0x1c5f
> +#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_PATSBURG_LPC	0x1d40
>  #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
>  #define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
>  #define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
> @@ -2628,9 +2629,9 @@
>  #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
>  #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
>  #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
> -#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN	0x3b00
> -#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX	0x3b1f
> -#define PCI_DEVICE_ID_INTEL_PCH_SMBUS	0x3b30
> +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN	0x3b00
> +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
> +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
>  #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
>  #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
> @@ -2639,8 +2640,8 @@
>  #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
>  #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
>  #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
> -#define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031
> -#define PCI_DEVICE_ID_INTEL_TOLAPAI_1	0x5032
> +#define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
> +#define PCI_DEVICE_ID_INTEL_EP80579_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
> --- linux-2.6.35.4/arch/x86/pci/irq.c.orig	2010-09-24 13:59:39.000000000 -0700
> +++ linux-2.6.35.4/arch/x86/pci/irq.c	2010-09-24 14:02:07.000000000 -0700
> @@ -584,28 +584,28 @@
>  	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:
> +	case PCI_DEVICE_ID_INTEL_EP80579_0:
>  	case PCI_DEVICE_ID_INTEL_ICH10_0:
>  	case PCI_DEVICE_ID_INTEL_ICH10_1:
>  	case PCI_DEVICE_ID_INTEL_ICH10_2:
>  	case PCI_DEVICE_ID_INTEL_ICH10_3:
> -	case PCI_DEVICE_ID_INTEL_PBG_LPC:
> +	case PCI_DEVICE_ID_INTEL_PATSBURG_LPC:
>  		r->name = "PIIX/ICH";
>  		r->get = pirq_piix_get;
>  		r->set = pirq_piix_set;
>  		return 1;
>  	}
>  
> -	if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
> -		(device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
> +	if ((device >= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN) && 
> +		(device <= PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX)) {
>  		r->name = "PIIX/ICH";
>  		r->get = pirq_piix_get;
>  		r->set = pirq_piix_set;
>  		return 1;
>  	}
>  
> -	if ((device >= PCI_DEVICE_ID_INTEL_CPT_LPC_MIN) && 
> -		(device <= PCI_DEVICE_ID_INTEL_CPT_LPC_MAX)) {
> +	if ((device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN) && 
> +		(device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)) {
>  		r->name = "PIIX/ICH";
>  		r->get = pirq_piix_get;
>  		r->set = pirq_piix_set;
> --- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig	2010-09-24 14:59:23.000000000 -0700
> +++ linux-2.6.35.4/drivers/i2c/busses/Kconfig	2010-10-04 13:10:44.000000000 -0700
> @@ -95,9 +95,9 @@
>  	    ESB2
>  	    ICH8
>  	    ICH9
> -	    Tolapai
> +	    EP80579 (Tolapai)
>  	    ICH10
> -	    3400/5 Series (PCH)
> +	    5/3400 Series (PCH)
>  	    Cougar Point (PCH)
>  
>  	  This driver can also be built as a module.  If so, the module
> --- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig	2010-09-24 14:57:55.000000000 -0700
> +++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c	2010-10-04 13:12:00.000000000 -0700
> @@ -38,10 +38,10 @@
>    82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
>    82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
>    82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
> -  Tolapai               0x5032     32     hard     yes     yes     yes
> +  EP80579 (Tolapai)     0x5032     32     hard     yes     yes     yes
>    ICH10                 0x3a30     32     hard     yes     yes     yes
>    ICH10                 0x3a60     32     hard     yes     yes     yes
> -  3400/5 Series (PCH)   0x3b30     32     hard     yes     yes     yes
> +  5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
>    Cougar Point (PCH)    0x1c22     32     hard     yes     yes     yes
>  
>    Features supported by this driver:
> @@ -587,11 +587,11 @@
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
> -	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EP80579_1) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
> -	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
> -	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS) },
>  	{ 0, }
>  };
>  
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


-- 
Jean Delvare

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg
       [not found]   ` <201010041327.15170.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
@ 2010-10-15 19:54     ` Jesse Barnes
  2010-10-16  6:40       ` Jean Delvare
  0 siblings, 1 reply; 7+ messages in thread
From: Jesse Barnes @ 2010-10-15 19:54 UTC (permalink / raw)
  To: Seth Heasley
  Cc: khali-PUYAD+kWke1g9hUCZPvPmw, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-pci-u79uwXL29TY76Z2rM5mHXA,
	linux-i2c-u79uwXL29TY76Z2rM5mHXA

On Mon, 4 Oct 2010 13:27:14 -0700
Seth Heasley <seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:

> >> --- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig   2010-09-24
> >14:59:23.000000000 -0700
> >> +++ linux-2.6.35.4/drivers/i2c/busses/Kconfig        2010-09-24
> >14:59:42.000000000 -0700
> >> @@ -95,7 +95,7 @@
> >>          ESB2
> >>          ICH8
> >>          ICH9
> >> -        Tolapai
> >> +        EP80579
> >>          ICH10
> >>          3400/5 Series (PCH)
> >
> >How did this become "5_3400_SERIES" in the symbol names? Shouldn't it
> >be 3400_5_SERIES instead?
> 
> The approved branding in pci.ids is 5/3400 Series, so I wanted to reflect that here.  I've changed it in Kconfig as well as i2c-i801.c to be consistent.
> 
> >> --- linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c.orig        2010-09-24
> >14:57:55.000000000 -0700
> >> +++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c     2010-09-24
> >14:59:13.000000000 -0700
> >> @@ -38,7 +38,7 @@
> >>    82801G   (ICH7)       0x27da     32     hard     yes     yes
> >yes
> >>    82801H   (ICH8)       0x283e     32     hard     yes     yes
> >yes
> >>    82801I   (ICH9)       0x2930     32     hard     yes     yes
> >yes
> >> -  Tolapai               0x5032     32     hard     yes     yes
> >yes
> >> +  EP80579               0x5032     32     hard     yes     yes
> >yes
> >
> >Maybe keep "Tolapai" inside parentheses, as people may know the
> >platform by that name by now?
> 
> Agreed.  I've updated that in both places it's referenced.  Final (hopefully) patch below:
> 
> This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
>  
> Signed-off-by: Seth Heasley <seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

Applied this update, thanks.

Note that going forward I don't expect (or want!) patches to convert
the development names into marketing names.  We should just add new
stuff with the development names (before the product ships) and leave
them that way to avoid unnecessary churn.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg
  2010-10-15 19:54     ` Jesse Barnes
@ 2010-10-16  6:40       ` Jean Delvare
  0 siblings, 0 replies; 7+ messages in thread
From: Jean Delvare @ 2010-10-16  6:40 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: Seth Heasley, linux-kernel, linux-pci, linux-i2c

On Fri, 15 Oct 2010 12:54:28 -0700, Jesse Barnes wrote:
> On Mon, 4 Oct 2010 13:27:14 -0700
> Seth Heasley <seth.heasley@intel.com> wrote:
> > This patch updates the defines for Intel devices in include/linux/pci_ids.h, referenced in arch/x86/pci/irq.c and drivers/i2c/busses/i2c-i801.c, reflecting approved legal branding, and using fuller code-names for products under development.
> >  
> > Signed-off-by: Seth Heasley <seth.heasley@intel.com>
> 
> Applied this update, thanks.
> 
> Note that going forward I don't expect (or want!) patches to convert
> the development names into marketing names.  We should just add new
> stuff with the development names (before the product ships) and leave
> them that way to avoid unnecessary churn.

Fine with me, as long as it is the actual names and not obscure
3-letter shortcuts.

-- 
Jean Delvare

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2010-10-16  6:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-24 23:06 [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Seth Heasley
     [not found] ` <201009241606.11840.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2010-09-25 11:30   ` Jean Delvare
     [not found]     ` <20100925133039.75e9ac71-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
2010-09-25 15:13       ` Heasley, Seth
2010-10-04 20:27 ` [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg Seth Heasley
2010-10-05  6:57   ` Jean Delvare
     [not found]   ` <201010041327.15170.seth.heasley-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2010-10-15 19:54     ` Jesse Barnes
2010-10-16  6:40       ` Jean Delvare

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).