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

Commit 3b993e8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-s3c2410: Build fix
  i2c/menelaus: Build fix
  i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang
  i2c-mpc: Don't disable I2C module on stop condition
  i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class
  i2c/isp1301_omap: Build fixes, whitespace
  i2c-mpc: Pass correct dev_id to free_irq on error path
  i2c-i801: Typo: erroneous
parents ab3c556d b5d0b4ba

drivers/i2c/busses/i2c-i801.c

+2 −2
Original line number Diff line number Diff line
@@ -272,11 +272,11 @@ static int i801_block_transaction_byte_by_byte(union i2c_smbus_data *data, 
		/* Make sure the SMBus host is ready to start transmitting */

		temp = inb_p(SMBHSTSTS);

		if (i == 1) {

			/* Erronenous conditions before transaction:

			/* Erroneous conditions before transaction:

			 * Byte_Done, Failed, Bus_Err, Dev_Err, Intr, Host_Busy */

			errmask = 0x9f;

		} else {

			/* Erronenous conditions during transaction:

			/* Erroneous conditions during transaction:

			 * Failed, Bus_Err, Dev_Err, Intr */

			errmask = 0x1e;

		}

drivers/i2c/busses/i2c-iop3xx.c

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) 
	memcpy(new_adapter->name, pdev->name, strlen(pdev->name));

	new_adapter->id = I2C_HW_IOP3XX;

	new_adapter->owner = THIS_MODULE;

	new_adapter->class = I2C_CLASS_HWMON;

	new_adapter->dev.parent = &pdev->dev;

	new_adapter->nr = pdev->id;

drivers/i2c/busses/i2c-mpc.c

+7 −4
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) 
			schedule();

			if (time_after(jiffies, orig_jiffies + timeout)) {

				pr_debug("I2C: timeout\n");

				writeccr(i2c, 0);

				result = -EIO;

				break;

			}
@@ -116,10 +117,12 @@ static int i2c_wait(struct mpc_i2c *i2c, unsigned timeout, int writing) 
		result = wait_event_interruptible_timeout(i2c->queue,

			(i2c->interrupt & CSR_MIF), timeout * HZ);



		if (unlikely(result < 0))

		if (unlikely(result < 0)) {

			pr_debug("I2C: wait interrupted\n");

		else if (unlikely(!(i2c->interrupt & CSR_MIF))) {

			writeccr(i2c, 0);

		} else if (unlikely(!(i2c->interrupt & CSR_MIF))) {

			pr_debug("I2C: wait timeout\n");

			writeccr(i2c, 0);

			result = -ETIMEDOUT;

		}
@@ -172,7 +175,6 @@ static void mpc_i2c_start(struct mpc_i2c *i2c) 
static void mpc_i2c_stop(struct mpc_i2c *i2c)

{

	writeccr(i2c, CCR_MEN);

	writeccr(i2c, 0);

}



static int mpc_write(struct mpc_i2c *i2c, int target,
@@ -261,6 +263,7 @@ static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
	while (readb(i2c->base + MPC_I2C_SR) & CSR_MBB) {

		if (signal_pending(current)) {

			pr_debug("I2C: Interrupted\n");

			writeccr(i2c, 0);

			return -EINTR;

		}

		if (time_after(jiffies, orig_jiffies + HZ)) {
@@ -362,7 +365,7 @@ static int fsl_i2c_probe(struct platform_device *pdev) 


      fail_add:

	if (i2c->irq != 0)

		free_irq(i2c->irq, NULL);

		free_irq(i2c->irq, i2c);

      fail_irq:

	iounmap(i2c->base);

      fail_map:

drivers/i2c/busses/i2c-mv64xxx.c

+17 −14
Original line number Diff line number Diff line
@@ -107,6 +107,21 @@ struct mv64xxx_i2c_data { 
 *

 *****************************************************************************

 */



/* Reset hardware and initialize FSM */

static void

mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)

{

	writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);

	writel((((drv_data->freq_m & 0xf) << 3) | (drv_data->freq_n & 0x7)),

		drv_data->reg_base + MV64XXX_I2C_REG_BAUD);

	writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);

	writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);

	writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,

		drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);

	drv_data->state = MV64XXX_I2C_STATE_IDLE;

}



static void

mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)

{
@@ -203,7 +218,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) 
			 drv_data->state, status, drv_data->msg->addr,

			 drv_data->msg->flags);

		drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP;

		drv_data->state = MV64XXX_I2C_STATE_IDLE;

		mv64xxx_i2c_hw_init(drv_data);

		drv_data->rc = -EIO;

	}

}
@@ -367,6 +382,7 @@ mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data) 
				"mv64xxx: I2C bus locked, block: %d, "

				"time_left: %d\n", drv_data->block,

				(int)time_left);

			mv64xxx_i2c_hw_init(drv_data);

		}

	} else

		spin_unlock_irqrestore(&drv_data->lock, flags);
@@ -443,19 +459,6 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = { 
 *

 *****************************************************************************

 */

static void __devinit

mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data)

{

	writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SOFT_RESET);

	writel((((drv_data->freq_m & 0xf) << 3) | (drv_data->freq_n & 0x7)),

		drv_data->reg_base + MV64XXX_I2C_REG_BAUD);

	writel(0, drv_data->reg_base + MV64XXX_I2C_REG_SLAVE_ADDR);

	writel(0, drv_data->reg_base + MV64XXX_I2C_REG_EXT_SLAVE_ADDR);

	writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,

		drv_data->reg_base + MV64XXX_I2C_REG_CONTROL);

	drv_data->state = MV64XXX_I2C_STATE_IDLE;

}



static int __devinit

mv64xxx_i2c_map_regs(struct platform_device *pd,

	struct mv64xxx_i2c_data *drv_data)

drivers/i2c/busses/i2c-s3c2410.c

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <asm/io.h>



#include <asm/arch/regs-gpio.h>

#include <asm/arch/regs-iic.h>

#include <asm/arch/iic.h>

#include <asm/plat-s3c/regs-iic.h>

#include <asm/plat-s3c/iic.h>



/* i2c controller state */