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

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

Merge branch 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux 

* 'for-30-rc5/all-i2c' of git://git.fluff.org/bjdooks/linux:
  i2c-bfin-twi: abort transfer is MEM bit is reset unexpectedly
  i2c-s3c2410: Remove useless break code
  i2c-s3c2410: Fix typo 'i2s' -> 'i2c'
  i2c: tegra: Assign unused slave address
parents 90c69064 69f81e86

drivers/i2c/busses/i2c-bfin-twi.c

+7 −1
Original line number Diff line number Diff line
@@ -193,7 +193,13 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface, 
		return;

	}

	if (twi_int_status & MCOMP) {

		if (iface->cur_mode == TWI_I2C_MODE_COMBINED) {

		if ((read_MASTER_CTL(iface) & MEN) == 0 &&

			(iface->cur_mode == TWI_I2C_MODE_REPEAT ||

			iface->cur_mode == TWI_I2C_MODE_COMBINED)) {

			iface->result = -1;

			write_INT_MASK(iface, 0);

			write_MASTER_CTL(iface, 0);

		} else if (iface->cur_mode == TWI_I2C_MODE_COMBINED) {

			if (iface->readNum == 0) {

				/* set the read number to 1 and ask for manual

				 * stop in block combine mode

drivers/i2c/busses/i2c-s3c2410.c

+3 −4
Original line number Diff line number Diff line
@@ -248,12 +248,12 @@ static inline int is_msgend(struct s3c24xx_i2c *i2c) 
	return i2c->msg_ptr >= i2c->msg->len;

}



/* i2s_s3c_irq_nextbyte

/* i2c_s3c_irq_nextbyte

 *

 * process an interrupt and work out what to do

 */



static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)

static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)

{

	unsigned long tmp;

	unsigned char byte;
@@ -264,7 +264,6 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) 
	case STATE_IDLE:

		dev_err(i2c->dev, "%s: called in STATE_IDLE\n", __func__);

		goto out;

		break;



	case STATE_STOP:

		dev_err(i2c->dev, "%s: called in STATE_STOP\n", __func__);
@@ -444,7 +443,7 @@ static irqreturn_t s3c24xx_i2c_irq(int irqno, void *dev_id) 
	/* pretty much this leaves us with the fact that we've

	 * transmitted or received whatever byte we last sent */



	i2s_s3c_irq_nextbyte(i2c, status);

	i2c_s3c_irq_nextbyte(i2c, status);



 out:

	return IRQ_HANDLED;

drivers/i2c/busses/i2c-tegra.c

+7 −1
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ 
#define I2C_CNFG_NEW_MASTER_FSM			(1<<11)

#define I2C_STATUS				0x01C

#define I2C_SL_CNFG				0x020

#define I2C_SL_CNFG_NACK			(1<<1)

#define I2C_SL_CNFG_NEWSL			(1<<2)

#define I2C_SL_ADDR1				0x02c

#define I2C_SL_ADDR2				0x030

#define I2C_TX_FIFO				0x050

#define I2C_RX_FIFO				0x054

#define I2C_PACKET_TRANSFER_STATUS		0x058
@@ -337,7 +339,11 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) 


	if (!i2c_dev->is_dvc) {

		u32 sl_cfg = i2c_readl(i2c_dev, I2C_SL_CNFG);

		i2c_writel(i2c_dev, sl_cfg | I2C_SL_CNFG_NEWSL, I2C_SL_CNFG);

		sl_cfg |= I2C_SL_CNFG_NACK | I2C_SL_CNFG_NEWSL;

		i2c_writel(i2c_dev, sl_cfg, I2C_SL_CNFG);

		i2c_writel(i2c_dev, 0xfc, I2C_SL_ADDR1);

		i2c_writel(i2c_dev, 0x00, I2C_SL_ADDR2);



	}



	val = 7 << I2C_FIFO_CONTROL_TX_TRIG_SHIFT |