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

Commit 50440c6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
  i2c-i801: Handle multiple instances instead of keeping global state
  i2c-i801: Add Intel Patsburg device ID
  i2c: Drop unused I2C_CLASS_TV flags
parents 09d692e6 55fee8d7

Documentation/i2c/busses/i2c-i801

+5 −1
Original line number Original line Diff line number Diff line
@@ -15,10 +15,14 @@ Supported adapters: 
  * Intel 82801I (ICH9)

  * Intel 82801I (ICH9)

  * Intel EP80579 (Tolapai)

  * Intel EP80579 (Tolapai)

  * Intel 82801JI (ICH10)

  * Intel 82801JI (ICH10)

  * Intel 3400/5 Series (PCH)

  * Intel 5/3400 Series (PCH)

  * Intel Cougar Point (PCH)

  * Intel Cougar Point (PCH)

  * Intel Patsburg (PCH)

   Datasheets: Publicly available at the Intel website

   Datasheets: Publicly available at the Intel website





On Intel Patsburg and later chipsets, both the normal host SMBus controller

and the additional 'Integrated Device Function' controllers are supported.



Authors: 

Authors: 

	Mark Studebaker <mdsxyz123@yahoo.com>

	Mark Studebaker <mdsxyz123@yahoo.com>

	Jean Delvare <khali@linux-fr.org>

	Jean Delvare <khali@linux-fr.org>

drivers/i2c/busses/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ config I2C_I801 
	    ICH10

	    ICH10

	    5/3400 Series (PCH)

	    5/3400 Series (PCH)

	    Cougar Point (PCH)

	    Cougar Point (PCH)

	    Patsburg (PCH)





	  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

+189 −144

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/tm6000/tm6000-i2c.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,6 @@ static struct i2c_algorithm tm6000_algo = { 




static struct i2c_adapter tm6000_adap_template = {

static struct i2c_adapter tm6000_adap_template = {

	.owner = THIS_MODULE,

	.owner = THIS_MODULE,

	.class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,

	.name = "tm6000",

	.name = "tm6000",

	.algo = &tm6000_algo,

	.algo = &tm6000_algo,

};

};

include/linux/i2c.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -407,8 +407,6 @@ void i2c_unlock_adapter(struct i2c_adapter *); 




/* i2c adapter classes (bitmask) */

/* i2c adapter classes (bitmask) */

#define I2C_CLASS_HWMON		(1<<0)	/* lm_sensors, ... */

#define I2C_CLASS_HWMON		(1<<0)	/* lm_sensors, ... */

#define I2C_CLASS_TV_ANALOG	(1<<1)	/* bttv + friends */

#define I2C_CLASS_TV_DIGITAL	(1<<2)	/* dvb cards */

#define I2C_CLASS_DDC		(1<<3)	/* DDC bus on graphics adapters */

#define I2C_CLASS_DDC		(1<<3)	/* DDC bus on graphics adapters */

#define I2C_CLASS_SPD		(1<<7)	/* SPD EEPROMs and similar */

#define I2C_CLASS_SPD		(1<<7)	/* SPD EEPROMs and similar */