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

Commit df2a8f39 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 i2c fixes from Wolfram Sang:
 "One bugfix for the tegra driver.  Two updates regarding email
  addresses and MAINTAINERS which I like to have up-to-date so people
  can be reached immediately.  While we are here, there is on PCI_ID
  addition."

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: add maintainer entry for atmel i2c driver
  i2c: Fix my e-mail address in drivers and documentation
  i2c: iSMT: add Intel Avoton DeviceIDs
  i2c: tegra: check the clk_prepare_enable() return value
parents a4e71e79 888f2804

Documentation/i2c/busses/i2c-diolan-u2c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Supported adapters: 
    Documentation:

	http://www.diolan.com/i2c/u2c12.html



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

Author: Guenter Roeck <linux@roeck-us.net>



Description

-----------

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,12 @@ F: drivers/dma/at_hdmac.c 
F:	drivers/dma/at_hdmac_regs.h

F:	include/linux/platform_data/dma-atmel.h



ATMEL I2C DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

L:	linux-i2c@vger.kernel.org

S:	Supported

F:	drivers/i2c/busses/i2c-at91.c



ATMEL ISI DRIVER

M:	Josh Wu <josh.wu@atmel.com>

L:	linux-media@vger.kernel.org

drivers/i2c/busses/i2c-ismt.c

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 
/* PCI DIDs for the Intel SMBus Message Transport (SMT) Devices */

#define PCI_DEVICE_ID_INTEL_S1200_SMT0	0x0c59

#define PCI_DEVICE_ID_INTEL_S1200_SMT1	0x0c5a

#define PCI_DEVICE_ID_INTEL_AVOTON_SMT	0x1f15



#define ISMT_DESC_ENTRIES	32	/* number of descriptor entries */

#define ISMT_MAX_RETRIES	3	/* number of SMBus retries to attempt */
@@ -185,6 +186,7 @@ struct ismt_priv { 
static const DEFINE_PCI_DEVICE_TABLE(ismt_ids) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },

	{ 0, }

};

drivers/i2c/busses/i2c-tegra.c

+11 −2
Original line number Diff line number Diff line
@@ -411,7 +411,11 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) 
	int clk_multiplier = I2C_CLK_MULTIPLIER_STD_FAST_MODE;

	u32 clk_divisor;



	tegra_i2c_clock_enable(i2c_dev);

	err = tegra_i2c_clock_enable(i2c_dev);

	if (err < 0) {

		dev_err(i2c_dev->dev, "Clock enable failed %d\n", err);

		return err;

	}



	tegra_periph_reset_assert(i2c_dev->div_clk);

	udelay(2);
@@ -628,7 +632,12 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
	if (i2c_dev->is_suspended)

		return -EBUSY;



	tegra_i2c_clock_enable(i2c_dev);

	ret = tegra_i2c_clock_enable(i2c_dev);

	if (ret < 0) {

		dev_err(i2c_dev->dev, "Clock enable failed %d\n", ret);

		return ret;

	}



	for (i = 0; i < num; i++) {

		enum msg_end_type end_type = MSG_END_STOP;

		if (i < (num - 1)) {

drivers/i2c/muxes/i2c-mux-pca9541.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (c) 2010 Ericsson AB.

 *

 * Author: Guenter Roeck <guenter.roeck@ericsson.com>

 * Author: Guenter Roeck <linux@roeck-us.net>

 *

 * Derived from:

 *  pca954x.c