Commit 69f81e86 authored by Ben Dooks's avatar Ben Dooks

Merge branches 'for-30-rc4/i2c-bfin', 'for-30-rc4/i2c-omap',...

Merge branches 'for-30-rc4/i2c-bfin', 'for-30-rc4/i2c-omap', 'for-30-rc4/i2c-s3c' and 'for-30-rc4/i2c-tegra' into for-30-rc5/all-i2c
...@@ -248,12 +248,12 @@ static inline int is_msgend(struct s3c24xx_i2c *i2c) ...@@ -248,12 +248,12 @@ static inline int is_msgend(struct s3c24xx_i2c *i2c)
return i2c->msg_ptr >= i2c->msg->len; return i2c->msg_ptr >= i2c->msg->len;
} }
/* i2s_s3c_irq_nextbyte /* i2c_s3c_irq_nextbyte
* *
* process an interrupt and work out what to do * 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 long tmp;
unsigned char byte; unsigned char byte;
...@@ -264,7 +264,6 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) ...@@ -264,7 +264,6 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
case STATE_IDLE: case STATE_IDLE:
dev_err(i2c->dev, "%s: called in STATE_IDLE\n", __func__); dev_err(i2c->dev, "%s: called in STATE_IDLE\n", __func__);
goto out; goto out;
break;
case STATE_STOP: case STATE_STOP:
dev_err(i2c->dev, "%s: called in STATE_STOP\n", __func__); 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) ...@@ -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 /* pretty much this leaves us with the fact that we've
* transmitted or received whatever byte we last sent */ * transmitted or received whatever byte we last sent */
i2s_s3c_irq_nextbyte(i2c, status); i2c_s3c_irq_nextbyte(i2c, status);
out: out:
return IRQ_HANDLED; return IRQ_HANDLED;
......
...@@ -40,8 +40,10 @@ ...@@ -40,8 +40,10 @@
#define I2C_CNFG_NEW_MASTER_FSM (1<<11) #define I2C_CNFG_NEW_MASTER_FSM (1<<11)
#define I2C_STATUS 0x01C #define I2C_STATUS 0x01C
#define I2C_SL_CNFG 0x020 #define I2C_SL_CNFG 0x020
#define I2C_SL_CNFG_NACK (1<<1)
#define I2C_SL_CNFG_NEWSL (1<<2) #define I2C_SL_CNFG_NEWSL (1<<2)
#define I2C_SL_ADDR1 0x02c #define I2C_SL_ADDR1 0x02c
#define I2C_SL_ADDR2 0x030
#define I2C_TX_FIFO 0x050 #define I2C_TX_FIFO 0x050
#define I2C_RX_FIFO 0x054 #define I2C_RX_FIFO 0x054
#define I2C_PACKET_TRANSFER_STATUS 0x058 #define I2C_PACKET_TRANSFER_STATUS 0x058
...@@ -337,7 +339,11 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) ...@@ -337,7 +339,11 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
if (!i2c_dev->is_dvc) { if (!i2c_dev->is_dvc) {
u32 sl_cfg = i2c_readl(i2c_dev, I2C_SL_CNFG); 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 | val = 7 << I2C_FIFO_CONTROL_TX_TRIG_SHIFT |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment