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

Commit 4858704d 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:
  therm_windtunnel: Convert to a new-style i2c driver
  therm_adt746x: Convert to a new-style i2c driver
  windfarm: Convert to new-style i2c drivers
  therm_pm72: Convert to a new-style i2c driver
  i2c-viapro: Add new PCI device ID for VX855
  i2c/chips: Move max6875 to drivers/misc/eeprom
  i2c: Do not give adapters a default parent
  i2c: Do not probe for TV chips on Voodoo3 adapters
  i2c: Retry automatically on arbitration loss
  i2c: Remove void casts
parents 86ade88e 036533e2

Documentation/i2c/busses/i2c-viapro

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ Supported adapters: 
  * VIA Technologies, Inc. VX800/VX820

    Datasheet: available on http://linux.via.com.tw



  * VIA Technologies, Inc. VX855/VX875

    Datasheet: Availability unknown



Authors:

	Kyösti Mälkki <kmalkki@cc.hut.fi>,

	Mark D. Studebaker <mdsxyz123@yahoo.com>,
@@ -53,6 +56,7 @@ Your lspci -n listing must show one of these : 
 device 1106:3287   (VT8251)

 device 1106:8324   (CX700)

 device 1106:8353   (VX800/VX820)

 device 1106:8409   (VX855/VX875)



If none of these show up, you should look in the BIOS for settings like

enable ACPI / SMBus or even USB.

arch/mips/configs/bigsur_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ CONFIG_EEPROM_LEGACY=y 
CONFIG_SENSORS_PCF8574=y

# CONFIG_PCF8575 is not set

CONFIG_SENSORS_PCF8591=y

CONFIG_SENSORS_MAX6875=y

CONFIG_EEPROM_MAX6875=y

# CONFIG_SENSORS_TSL2550 is not set

CONFIG_I2C_DEBUG_CORE=y

CONFIG_I2C_DEBUG_ALGO=y

arch/mips/configs/mtx1_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -1849,7 +1849,7 @@ CONFIG_EEPROM_LEGACY=m 
CONFIG_SENSORS_PCF8574=m

CONFIG_SENSORS_PCA9539=m

CONFIG_SENSORS_PCF8591=m

CONFIG_SENSORS_MAX6875=m

CONFIG_EEPROM_MAX6875=m

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

arch/powerpc/configs/ppc6xx_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -1808,7 +1808,7 @@ CONFIG_PCF8575=m 
CONFIG_SENSORS_PCA9539=m

CONFIG_SENSORS_PCF8591=m

# CONFIG_TPS65010 is not set

CONFIG_SENSORS_MAX6875=m

CONFIG_EEPROM_MAX6875=m

CONFIG_SENSORS_TSL2550=m

CONFIG_MCU_MPC8349EMITX=m

# CONFIG_I2C_DEBUG_CORE is not set

drivers/i2c/busses/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ config I2C_VIA 
	  will be called i2c-via.



config I2C_VIAPRO

	tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"

	tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx"

	depends on PCI

	help

	  If you say yes to this option, support will be included for the VIA
@@ -225,8 +225,8 @@ config I2C_VIAPRO 
	    VT8237R/A/S

	    VT8251

	    CX700

	    VX800

	    VX820

	    VX800/VX820

	    VX855/VX875



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

	  will be called i2c-viapro.