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

Commit f7a6ad9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull more i2c updates from Wolfram Sang:
 "Mostly bugfixes, small but wanted cleanups, and Paul's init.h removal
  applied"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rcar: fix NACK error code
  i2c: update i2c_algorithm documentation
  i2c: rcar: use devm_clk_get to ensure clock is properly ref-counted
  i2c: rcar: do not print error if device nacks transfer
  i2c: rely on driver core when sanitizing devices
  i2c: delete non-required instances of include <linux/init.h>
  i2c: acorn: is tristate and should use module.h
  i2c: piix4: Standardize log messages
  i2c: piix4: Use different message for AMD Auxiliary SMBus Controller
  i2c: piix4: Add support for AMD ML and CZ SMBus changes
parents 9076e0ca 6ff4b105

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Supported adapters: 
  * AMD SP5100 (SB700 derivative found on some server mainboards)

    Datasheet: Publicly available at the AMD website

    http://support.amd.com/us/Embedded_TechDocs/44413.pdf

  * AMD Hudson-2, CZ

  * AMD Hudson-2, ML, CZ

    Datasheet: Not publicly available

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

    Datasheet: Publicly available at the SMSC website http://www.smsc.com

drivers/i2c/algos/i2c-algo-bit.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/sched.h>

#include <linux/i2c.h>

drivers/i2c/algos/i2c-algo-pca.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/moduleparam.h>

#include <linux/delay.h>

#include <linux/jiffies.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-pca.h>

drivers/i2c/algos/i2c-algo-pcf.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/errno.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-pcf.h>

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ config I2C_PIIX4 
	    ATI SB700/SP5100

	    ATI SB800

	    AMD Hudson-2

	    AMD ML

	    AMD CZ

	    Serverworks OSB4

	    Serverworks CSB5