Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d28dc711 authored by Gaston, Jason D's avatar Gaston, Jason D Committed by Jean Delvare
Browse files

i2c-i801: Add support for the ICH10 



Add the Intel ICH10 SMBus Controller DeviceID's and updates
Tolapai support.

Signed-off-by: default avatarJason Gaston <jason.d.gaston@intel.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 26386763

Documentation/i2c/busses/i2c-i801

+2 −1
Original line number Original line Diff line number Diff line
@@ -12,8 +12,9 @@ Supported adapters: 
  * Intel 82801G (ICH7)

  * Intel 82801G (ICH7)

  * Intel 631xESB/632xESB (ESB2)

  * Intel 631xESB/632xESB (ESB2)

  * Intel 82801H (ICH8)

  * Intel 82801H (ICH8)

  * Intel ICH9

  * Intel 82801I (ICH9)

  * Intel Tolapai

  * Intel Tolapai

  * Intel ICH10

   Datasheets: Publicly available at the Intel website

   Datasheets: Publicly available at the Intel website





Authors: 

Authors:

drivers/i2c/busses/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -177,6 +177,8 @@ config I2C_I801 
	    ESB2

	    ESB2

	    ICH8

	    ICH8

	    ICH9

	    ICH9

	    Tolapai

	    ICH10





	  This driver can also be built as a module.  If so, the module

	  This driver can also be built as a module.  If so, the module

	  will be called i2c-i801.

	  will be called i2c-i801.

drivers/i2c/busses/i2c-i801.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -40,7 +40,9 @@ 
  82801G   (ICH7)       0x27da     32     hard     yes     yes     yes

  82801G   (ICH7)       0x27da     32     hard     yes     yes     yes

  82801H   (ICH8)       0x283e     32     hard     yes     yes     yes

  82801H   (ICH8)       0x283e     32     hard     yes     yes     yes

  82801I   (ICH9)       0x2930     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:

  Features supported by this driver:

  Software PEC                     no

  Software PEC                     no
@@ -588,6 +590,8 @@ static struct pci_device_id i801_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },

	{ 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_ICH9_6) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },

	{ 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, }

	{ 0, }

};

};
@@ -608,10 +612,12 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id 
	case PCI_DEVICE_ID_INTEL_ESB2_17:

	case PCI_DEVICE_ID_INTEL_ESB2_17:

	case PCI_DEVICE_ID_INTEL_ICH8_5:

	case PCI_DEVICE_ID_INTEL_ICH8_5:

	case PCI_DEVICE_ID_INTEL_ICH9_6:

	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;

		i801_features |= FEATURE_I2C_BLOCK_READ;

		/* fall through */

		/* fall through */

	case PCI_DEVICE_ID_INTEL_82801DB_3:

	case PCI_DEVICE_ID_INTEL_82801DB_3:

	case PCI_DEVICE_ID_INTEL_TOLAPAI_1:

		i801_features |= FEATURE_SMBUS_PEC;

		i801_features |= FEATURE_SMBUS_PEC;

		i801_features |= FEATURE_BLOCK_BUFFER;

		i801_features |= FEATURE_BLOCK_BUFFER;

		break;

		break;