[PATCH 3/4] i2c-i801: SMBus patch for Intel Coleto Creek DeviceIDs
This patch adds the i801 SMBus Controller DeviceIDs for the Intel Coleto Creek
PCH.
Signed-off-by: Seth Heasley seth.heas...@intel.com
---
Documentation/i2c/busses/i2c-i801 |1 +
drivers/i2c/busses/Kconfig|1 +
drivers/i2c/busses/i2c-i801.c |3 +++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/i2c/busses/i2c-i801
b/Documentation/i2c/busses/i2c-i801
index d55b8ab..d29dea0 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -24,6 +24,7 @@ Supported adapters:
* Intel Lynx Point-LP (PCH)
* Intel Avoton (SOC)
* Intel Wellsburg (PCH)
+ * Intel Coleto Creek (PCH)
Datasheets: Publicly available at the Intel website
On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 631736e..da3af83 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -108,6 +108,7 @@ config I2C_I801
Lynx Point-LP (PCH)
Avoton (SOC)
Wellsburg (PCH)
+ Coleto Creek (PCH)
This driver can also be built as a module. If so, the module
will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 3a6903f..4ebceed 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -58,6 +58,7 @@
Wellsburg (PCH) MS0x8d7d 32 hard yes yes yes
Wellsburg (PCH) MS0x8d7e 32 hard yes yes yes
Wellsburg (PCH) MS0x8d7f 32 hard yes yes yes
+ Coleto Creek (PCH)0x23b0 32 hard yes yes yes
Features supported by this driver:
Software PEC no
@@ -169,6 +170,7 @@
#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS 0x1e22
#define PCI_DEVICE_ID_INTEL_AVOTON_SMBUS 0x1f3c
#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
+#define PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS 0x23b0
#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS0x3b30
#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS0x8c22
#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS0x8d22
@@ -817,6 +819,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS0) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS) },
{ 0, }
};
--
1.7.4.4
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] i2c-i801: SMBus patch for Intel Avoton DeviceIDs
This patch adds the PCU SMBus DeviceID for the Intel Avoton SOC.
Signed-off-by: Seth Heasley seth.heas...@intel.com
---
Documentation/i2c/busses/i2c-i801 |1 +
drivers/i2c/busses/Kconfig|1 +
drivers/i2c/busses/i2c-i801.c |3 +++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/i2c/busses/i2c-i801
b/Documentation/i2c/busses/i2c-i801
index 157416e..8d71d57 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -22,6 +22,7 @@ Supported adapters:
* Intel Panther Point (PCH)
* Intel Lynx Point (PCH)
* Intel Lynx Point-LP (PCH)
+ * Intel Avoton (SOC)
Datasheets: Publicly available at the Intel website
On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 0bb7ff4..87df863 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -106,6 +106,7 @@ config I2C_I801
Panther Point (PCH)
Lynx Point (PCH)
Lynx Point-LP (PCH)
+ Avoton (SOC)
This driver can also be built as a module. If so, the module
will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 3092387..af15aeb 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -53,6 +53,7 @@
Panther Point (PCH) 0x1e22 32 hard yes yes yes
Lynx Point (PCH) 0x8c22 32 hard yes yes yes
Lynx Point-LP (PCH) 0x9c22 32 hard yes yes yes
+ Avoton (SOC) 0x1f3c 32 hard yes yes yes
Features supported by this driver:
Software PEC no
@@ -166,6 +167,7 @@
#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS0x3b30
#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS0x8c22
#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS 0x9c22
+#define PCI_DEVICE_ID_INTEL_AVOTON_SMBUS 0x1f3c
struct i801_mux_config {
char *gpio_chip;
@@ -798,6 +800,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS)
},
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMBUS) },
{ 0, }
};
--
1.7.4.4
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] i2c-i801: SMBus patch for Intel Lynx Point DeviceIDs
This patch adds the SMBus controller DeviceIDs for the Intel Lynx Point PCH.
Signed-off-by: Seth Heasley seth.heas...@intel.com
---
Documentation/i2c/busses/i2c-i801 |1 +
drivers/i2c/busses/Kconfig|1 +
drivers/i2c/busses/i2c-i801.c |3 +++
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/i2c/busses/i2c-i801
b/Documentation/i2c/busses/i2c-i801
index 2871fd5..71f55bb 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -20,6 +20,7 @@ Supported adapters:
* Intel Patsburg (PCH)
* Intel DH89xxCC (PCH)
* Intel Panther Point (PCH)
+ * Intel Lynx Point (PCH)
Datasheets: Publicly available at the Intel website
On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index a3afac4..ff64291 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -103,6 +103,7 @@ config I2C_I801
Patsburg (PCH)
DH89xxCC (PCH)
Panther Point (PCH)
+ Lynx Point (PCH)
This driver can also be built as a module. If so, the module
will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index ab26840d..f9c3ca0 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -51,6 +51,7 @@
Patsburg (PCH) IDF0x1d72 32 hard yes yes yes
DH89xxCC (PCH)0x2330 32 hard yes yes yes
Panther Point (PCH) 0x1e22 32 hard yes yes yes
+ Lynx Point (PCH) 0x8c22 32 hard yes yes yes
Features supported by this driver:
Software PEC no
@@ -145,6 +146,7 @@
#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS 0x1e22
#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS0x3b30
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS0x8c22
struct i801_priv {
struct i2c_adapter adapter;
@@ -633,6 +635,7 @@ static const struct pci_device_id i801_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS)
},
{ 0, }
};
--
1.7.4.4
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2.6.39-rc3] i2c-i801: SMBus patch for Intel Panther Point DeviceIDs
This patch adds the SMBus controller DeviceID for the Intel Panther Point PCH.
Signed-off-by: Seth Heasley seth.heas...@intel.com
---
--- linux-2.6.39-rc3/Documentation/i2c/busses/i2c-i801.orig 2011-04-11
17:21:51.0 -0700
+++ linux-2.6.39-rc3/Documentation/i2c/busses/i2c-i801 2011-04-14
11:56:59.0 -0700
@@ -19,6 +19,7 @@
* Intel 6 Series (PCH)
* Intel Patsburg (PCH)
* Intel DH89xxCC (PCH)
+ * Intel Panther Point (PCH)
Datasheets: Publicly available at the Intel website
On Intel Patsburg and later chipsets, both the normal host SMBus controller
--- linux-2.6.39-rc3/drivers/i2c/busses/Kconfig.orig2011-04-11
17:21:51.0 -0700
+++ linux-2.6.39-rc3/drivers/i2c/busses/Kconfig 2011-04-14 12:02:27.0
-0700
@@ -101,6 +101,7 @@
6 Series (PCH)
Patsburg (PCH)
DH89xxCC (PCH)
+ Panther Point (PCH)
This driver can also be built as a module. If so, the module
will be called i2c-i801.
--- linux-2.6.39-rc3/drivers/i2c/busses/i2c-i801.c.orig 2011-04-11
17:21:51.0 -0700
+++ linux-2.6.39-rc3/drivers/i2c/busses/i2c-i801.c 2011-04-14
12:03:57.0 -0700
@@ -50,6 +50,7 @@
Patsburg (PCH) IDF0x1d71 32 hard yes yes yes
Patsburg (PCH) IDF0x1d72 32 hard yes yes yes
DH89xxCC (PCH)0x2330 32 hard yes yes yes
+ Panther Point (PCH) 0x1e22 32 hard yes yes yes
Features supported by this driver:
Software PEC no
@@ -623,6 +624,7 @@
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS) },
{ 0, }
};
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2.6.37] i2c-i801: SMBus patch for Intel DH89xxCC DeviceIDs
This patch adds the SMBus Controller DeviceIDs for the Intel DH89xxCC PCH.
Signed-off-by: Seth Heasley seth.heas...@intel.com
--- linux-2.6.37/drivers/i2c/busses/i2c-i801.c.orig 2011-01-04
16:50:19.0 -0800
+++ linux-2.6.37/drivers/i2c/busses/i2c-i801.c 2011-01-06 14:26:20.0
-0800
@@ -44,11 +44,12 @@
ICH10 0x3a30 32 hard yes yes yes
ICH10 0x3a60 32 hard yes yes yes
5/3400 Series (PCH) 0x3b30 32 hard yes yes yes
- Cougar Point (PCH)0x1c22 32 hard yes yes yes
+ 6 Series (PCH)0x1c22 32 hard yes yes yes
Patsburg (PCH)0x1d22 32 hard yes yes yes
Patsburg (PCH) IDF0x1d70 32 hard yes yes yes
Patsburg (PCH) IDF0x1d71 32 hard yes yes yes
Patsburg (PCH) IDF0x1d72 32 hard yes yes yes
+ DH89xxCC (PCH)0x2330 32 hard yes yes yes
Features supported by this driver:
Software PEC no
@@ -620,6 +621,7 @@
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS) },
{ 0, }
};
--- linux-2.6.37/drivers/i2c/busses/Kconfig.orig2011-01-04
16:50:19.0 -0800
+++ linux-2.6.37/drivers/i2c/busses/Kconfig 2011-01-06 14:25:56.0
-0800
@@ -98,8 +98,9 @@
EP80579 (Tolapai)
ICH10
5/3400 Series (PCH)
- Cougar Point (PCH)
+ 6 Series (PCH)
Patsburg (PCH)
+ DH89xxCC (PCH)
This driver can also be built as a module. If so, the module
will be called i2c-i801.
--- linux-2.6.37/Documentation/i2c/busses/i2c-i801.orig 2011-01-04
16:50:19.0 -0800
+++ linux-2.6.37/Documentation/i2c/busses/i2c-i801 2011-01-06
14:27:03.0 -0800
@@ -16,8 +16,9 @@
* Intel EP80579 (Tolapai)
* Intel 82801JI (ICH10)
* Intel 5/3400 Series (PCH)
- * Intel Cougar Point (PCH)
+ * Intel 6 Series (PCH)
* Intel Patsburg (PCH)
+ * Intel DH89xxCC (PCH)
Datasheets: Publicly available at the Intel website
On Intel Patsburg and later chipsets, both the normal host SMBus controller
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel Patsburg
--- linux-2.6.35.4/drivers/i2c/busses/Kconfig.orig 2010-09-24
14:59:23.0 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig2010-09-24
14:59:42.0 -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.orig2010-09-24
14:57:55.0 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/i2c-i801.c 2010-09-24
14:59:13.0 -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.heas...@intel.com
--- linux-2.6.35.4/include/linux/pci_ids.h.orig 2010-08-26 16:47:12.0
-0700
+++ linux-2.6.35.4/include/linux/pci_ids.h 2010-09-24 13:56:47.0
-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_MIN0x1c41
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX0x1c5f
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX0x1c5f
+#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_30x3a1a
#define PCI_DEVICE_ID_INTEL_ICH10_40x3a30
#define PCI_DEVICE_ID_INTEL_ICH10_50x3a60
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN0x3b00
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX0x3b1f
-#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_SMBUS0x3b30
#define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f
#define PCI_DEVICE_ID_INTEL_5100_160x65f0
#define PCI_DEVICE_ID_INTEL_5100_210x65f5
@@ -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.0
-0700
+++ linux-2.6.35.4/arch/x86/pci/irq.c 2010-09-24 14:02:07.0 -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
Re: [PATCH 2.6.35.4] irq: irq and pci_ids patch for Intel
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.heas...@intel.com
--- linux-2.6.35.4/include/linux/pci_ids.h.orig 2010-08-26 16:47:12.0
-0700
+++ linux-2.6.35.4/include/linux/pci_ids.h 2010-09-24 13:56:47.0
-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_MIN0x1c41
-#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX0x1c5f
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN0x1c41
+#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX0x1c5f
+#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_30x3a1a
#define PCI_DEVICE_ID_INTEL_ICH10_40x3a30
#define PCI_DEVICE_ID_INTEL_ICH10_50x3a60
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN0x3b00
-#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX0x3b1f
-#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_SMBUS0x3b30
#define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f
#define PCI_DEVICE_ID_INTEL_5100_160x65f0
#define PCI_DEVICE_ID_INTEL_5100_210x65f5
@@ -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.0
-0700
+++ linux-2.6.35.4/arch/x86/pci/irq.c 2010-09-24 14:02:07.0 -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.0 -0700
+++ linux-2.6.35.4/drivers/i2c/busses/Kconfig 2010-09-24 14:59:42.0
-0700
@@ -95,7 +95,7 @@
ESB2
ICH8
ICH9
- Tolapai
+ EP80579
ICH10
3400/5 Series (PCH)
Cougar Point
