Commit bdaf12b4 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-viapro: Don't log nacks
  i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
  MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
  i2c/mux: Driver for PCA9541 I2C Master Selector
  i2c: Optimize function i2c_detect()
  i2c: Discard warning message on device instantiation from user-space
  i2c-amd8111: Add proper error handling
  i2c: Change to new flag variable
  i2c: Remove unneeded inclusions of <linux/i2c-id.h>
  i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
  i2c: Simplify i2c_parent_is_i2c_adapter
  i2c-pca-platform: Change device name of request_irq
  i2c: Fix Kconfig dependencies
parents 7c024e95 bf5d95c8

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4541,6 +4541,12 @@ S: Maintained 
F:	drivers/leds/leds-pca9532.c

F:	include/linux/leds-pca9532.h



PCA9541 I2C BUS MASTER SELECTOR DRIVER

M:	Guenter Roeck <guenter.roeck@ericsson.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/muxes/pca9541.c



PCA9564/PCA9665 I2C BUS DRIVER

M:	Wolfram Sang <w.sang@pengutronix.de>

L:	linux-i2c@vger.kernel.org

drivers/gpu/drm/nouveau/nouveau_i2c.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define __NOUVEAU_I2C_H__



#include <linux/i2c.h>

#include <linux/i2c-id.h>

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

#include "drm_dp_helper.h"

drivers/gpu/drm/radeon/radeon_mode.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <drm_dp_helper.h>

#include <drm_fixed.h>

#include <linux/i2c.h>

#include <linux/i2c-id.h>

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



struct radeon_bo;

drivers/i2c/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ config I2C_HELPER_AUTO 
	  In doubt, say Y.



config I2C_SMBUS

	tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO

	tristate

	prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO

	help

	  Say Y here if you want support for SMBus extensions to the I2C

	  specification. At the moment, the only supported extension is

drivers/i2c/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o 
obj-$(CONFIG_I2C_MUX)		+= i2c-mux.o

obj-y				+= algos/ busses/ muxes/



ifeq ($(CONFIG_I2C_DEBUG_CORE),y)

EXTRA_CFLAGS += -DDEBUG

endif
 
ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG

CRA Git | Maintained and supported by SUSTech CRA and CCSE