LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 2.6.25-rc1] i2c-i801: SMBus patch for Intel ICH10 DeviceID's
@ 2008-02-12  0:45 Gaston, Jason D
  2008-02-12  9:01 ` Jean Delvare
  0 siblings, 1 reply; 3+ messages in thread
From: Gaston, Jason D @ 2008-02-12  0:45 UTC (permalink / raw)
  To: khali, linux-kernel, gregkh, Gaston, Jason D, i2c

This patch adds the Intel ICH10 SMBus Controller DeviceID's and updates
Tolapai support.

Signed-off-by:  Jason Gaston <jason.d.gaston@intel.com>


--- linux-2.6.25-rc1/Documentation/i2c/busses/i2c-i801.orig
2008-02-11 15:17:33.000000000 -0800
+++ linux-2.6.25-rc1/Documentation/i2c/busses/i2c-i801	2008-02-11
15:18:13.000000000 -0800
@@ -12,8 +12,9 @@
   * Intel 82801G (ICH7)
   * Intel 631xESB/632xESB (ESB2)
   * Intel 82801H (ICH8)
-  * Intel ICH9
+  * Intel 82801I (ICH9)
   * Intel Tolapai
+  * Intel ICH10
    Datasheets: Publicly available at the Intel website
 
 Authors: 
--- linux-2.6.25-rc1/drivers/i2c/busses/i2c-i801.c.orig	2008-02-11
15:10:52.000000000 -0800
+++ linux-2.6.25-rc1/drivers/i2c/busses/i2c-i801.c	2008-02-11
16:30:11.000000000 -0800
@@ -40,7 +40,9 @@
   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     ?       ?
+  Tolapai               0x5032     32     hard     yes     yes     yes
+  ICH10                 0x3a30     32     hard     yes     yes     yes
+  ICH10                 0x3a60     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no
@@ -588,6 +590,8 @@
 	{ 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_ICH10_4)
},
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5)
},
 	{ 0, }
 };
 
@@ -608,10 +612,12 @@
 	case PCI_DEVICE_ID_INTEL_ESB2_17:
 	case PCI_DEVICE_ID_INTEL_ICH8_5:
 	case PCI_DEVICE_ID_INTEL_ICH9_6:
+	case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
+	case PCI_DEVICE_ID_INTEL_ICH10_4:
+	case PCI_DEVICE_ID_INTEL_ICH10_5:
 		i801_features |= FEATURE_I2C_BLOCK_READ;
 		/* fall through */
 	case PCI_DEVICE_ID_INTEL_82801DB_3:
-	case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
 		i801_features |= FEATURE_SMBUS_PEC;
 		i801_features |= FEATURE_BLOCK_BUFFER;
 		break;
--- linux-2.6.25-rc1/drivers/i2c/busses/Kconfig.orig	2008-02-11
15:10:18.000000000 -0800
+++ linux-2.6.25-rc1/drivers/i2c/busses/Kconfig	2008-02-11
16:32:10.000000000 -0800
@@ -177,6 +177,8 @@
 	    ESB2
 	    ICH8
 	    ICH9
+	    Tolapai
+	    ICH10
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-i801.
--- linux-2.6.25-rc1/include/linux/pci_ids.h.orig	2008-02-11
15:18:58.000000000 -0800
+++ linux-2.6.25-rc1/include/linux/pci_ids.h	2008-02-11
15:20:45.000000000 -0800
@@ -2373,6 +2373,12 @@
 #define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a
 #define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e
 #define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
+#define PCI_DEVICE_ID_INTEL_ICH10_0	0x3a14
+#define PCI_DEVICE_ID_INTEL_ICH10_1	0x3a16
+#define PCI_DEVICE_ID_INTEL_ICH10_2	0x3a18
+#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_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
 #define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031

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

* Re: [PATCH 2.6.25-rc1] i2c-i801: SMBus patch for Intel ICH10 DeviceID's
  2008-02-12  0:45 [PATCH 2.6.25-rc1] i2c-i801: SMBus patch for Intel ICH10 DeviceID's Gaston, Jason D
@ 2008-02-12  9:01 ` Jean Delvare
  2008-02-12 18:05   ` Gaston, Jason D
  0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2008-02-12  9:01 UTC (permalink / raw)
  To: Gaston, Jason D; +Cc: linux-kernel, Greg KH, i2c

Hi Jason,

On Mon, 11 Feb 2008 16:45:17 -0800, Gaston, Jason D wrote:
> This patch adds the Intel ICH10 SMBus Controller DeviceID's and updates
> Tolapai support.
> 
> Signed-off-by:  Jason Gaston <jason.d.gaston@intel.com>

Patch applied. Please note that your e-mail client corrupted the patch
and I had to edit it manually before it would apply properly. Next time
please make sure that the patch is left unchanged so that it applies
directly.

> --- linux-2.6.25-rc1/Documentation/i2c/busses/i2c-i801.orig
> 2008-02-11 15:17:33.000000000 -0800
> +++ linux-2.6.25-rc1/Documentation/i2c/busses/i2c-i801	2008-02-11
> 15:18:13.000000000 -0800
> @@ -12,8 +12,9 @@
>    * Intel 82801G (ICH7)
>    * Intel 631xESB/632xESB (ESB2)
>    * Intel 82801H (ICH8)
> -  * Intel ICH9
> +  * Intel 82801I (ICH9)
>    * Intel Tolapai
> +  * Intel ICH10
>     Datasheets: Publicly available at the Intel website
>  
>  Authors: 
> --- linux-2.6.25-rc1/drivers/i2c/busses/i2c-i801.c.orig	2008-02-11
> 15:10:52.000000000 -0800
> +++ linux-2.6.25-rc1/drivers/i2c/busses/i2c-i801.c	2008-02-11
> 16:30:11.000000000 -0800
> @@ -40,7 +40,9 @@
>    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     ?       ?
> +  Tolapai               0x5032     32     hard     yes     yes     yes
> +  ICH10                 0x3a30     32     hard     yes     yes     yes
> +  ICH10                 0x3a60     32     hard     yes     yes     yes
>  
>    Features supported by this driver:
>    Software PEC                     no
> @@ -588,6 +590,8 @@
>  	{ 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_ICH10_4)
> },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5)
> },
>  	{ 0, }
>  };
>  
> @@ -608,10 +612,12 @@
>  	case PCI_DEVICE_ID_INTEL_ESB2_17:
>  	case PCI_DEVICE_ID_INTEL_ICH8_5:
>  	case PCI_DEVICE_ID_INTEL_ICH9_6:
> +	case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
> +	case PCI_DEVICE_ID_INTEL_ICH10_4:
> +	case PCI_DEVICE_ID_INTEL_ICH10_5:
>  		i801_features |= FEATURE_I2C_BLOCK_READ;
>  		/* fall through */
>  	case PCI_DEVICE_ID_INTEL_82801DB_3:
> -	case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
>  		i801_features |= FEATURE_SMBUS_PEC;
>  		i801_features |= FEATURE_BLOCK_BUFFER;
>  		break;
> --- linux-2.6.25-rc1/drivers/i2c/busses/Kconfig.orig	2008-02-11
> 15:10:18.000000000 -0800
> +++ linux-2.6.25-rc1/drivers/i2c/busses/Kconfig	2008-02-11
> 16:32:10.000000000 -0800
> @@ -177,6 +177,8 @@
>  	    ESB2
>  	    ICH8
>  	    ICH9
> +	    Tolapai
> +	    ICH10
>  
>  	  This driver can also be built as a module.  If so, the module
>  	  will be called i2c-i801.
> --- linux-2.6.25-rc1/include/linux/pci_ids.h.orig	2008-02-11
> 15:18:58.000000000 -0800
> +++ linux-2.6.25-rc1/include/linux/pci_ids.h	2008-02-11
> 15:20:45.000000000 -0800
> @@ -2373,6 +2373,12 @@
>  #define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a
>  #define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e
>  #define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
> +#define PCI_DEVICE_ID_INTEL_ICH10_0	0x3a14
> +#define PCI_DEVICE_ID_INTEL_ICH10_1	0x3a16
> +#define PCI_DEVICE_ID_INTEL_ICH10_2	0x3a18
> +#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_IOAT_SNB	0x402f
>  #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
>  #define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031

I left out this last part as it was already sent separately to the PCI
subsystem maintainer. I will wait for Greg to pick it before I send the
i2c-i801 update upstream.

Thanks,
-- 
Jean Delvare

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

* RE: [PATCH 2.6.25-rc1] i2c-i801: SMBus patch for Intel ICH10 DeviceID's
  2008-02-12  9:01 ` Jean Delvare
@ 2008-02-12 18:05   ` Gaston, Jason D
  0 siblings, 0 replies; 3+ messages in thread
From: Gaston, Jason D @ 2008-02-12 18:05 UTC (permalink / raw)
  To: Jean Delvare; +Cc: linux-kernel, Greg KH, i2c

>
>Patch applied. Please note that your e-mail client corrupted the patch
>and I had to edit it manually before it would apply properly. Next time
>please make sure that the patch is left unchanged so that it applies
>directly.
>
>I left out this last part as it was already sent separately to the PCI
>subsystem maintainer. I will wait for Greg to pick it before I send the
>i2c-i801 update upstream.
>
>Thanks,
>-- 
>Jean Delvare
>

Thank you very much.  Sorry about the email client and wordwrap.  I was
just about to repost it using a different email client, thanks for
cleaning it up for me.

Jason

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

end of thread, other threads:[~2008-02-12 18:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-12  0:45 [PATCH 2.6.25-rc1] i2c-i801: SMBus patch for Intel ICH10 DeviceID's Gaston, Jason D
2008-02-12  9:01 ` Jean Delvare
2008-02-12 18:05   ` Gaston, Jason D

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).