github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

update i2c drivers and update i2c-tools: max value number = 16

Browse Source
This commit is contained in:
kfx 2011-01-24 14:08:47 +08:00
parent 4e03e36eb8
commit 8f7a97132b
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/i2c/busses/i2c-dev-rk29.c
View File

@ -259,7 +259,7 @@ static int i2c_dev_get_value(struct i2c_get_info *get)
int ret = 0;
struct i2c_adapter *adap = NULL;
if(get->num >= MAX_VALUE_NUM)
if(get->num > MAX_VALUE_NUM)
return -1;
adap = i2c_get_adapter(get->id);
if(adap == NULL)
@ -287,7 +287,7 @@ static int i2c_dev_set_value(struct i2c_set_info *set)
struct i2c_adapter *adap = NULL;
printk("id=%d, addr=0x%x, mode = %c, num = %d, reg = 0x%x, value[0] = %d,",set->id, set->addr, set->mode, set->num, set->reg, set->value[0]);
if(set->num >= MAX_VALUE_NUM)
if(set->num > MAX_VALUE_NUM)
return -1;
adap = i2c_get_adapter(set->id);
if(adap == NULL)

39
drivers/i2c/busses/i2c-rk29.c
View File

@ -32,8 +32,16 @@
#include "i2c-rk29.h"
#define DRV_NAME "rk29_i2c"
#define RETRY_NUM 1
#define RK29_UDELAY_TIME(scl_rate) ((400*1000)/(scl_rate))
/*max ACK delay time = RK29_I2C_ACK_TIMEOUT_COUNT * RK29_UDELAY_TIME(scl_rate) us */
#define RK29_I2C_ACK_TIMEOUT_COUNT (10 * 1000)
/*max STOP delay time = RK29_I2C_STOP_TIMEOUT_COUNT * RK29_UDELAY_TIME(scl_rate) us */
#define RK29_I2C_STOP_TIMEOUT_COUNT 1000
/*max START delay time = RK29_I2C_START_TIMEOUT_COUNT * RK29_UDELAY_TIME(scl_rate) us */
#define RK29_I2C_START_TIMEOUT_COUNT 1000
#define RK29_I2C_TIMEOUT(x) (msecs_to_jiffies(x))
#if 0
#define i2c_dbg(dev, format, arg...) \
@ -72,6 +80,9 @@ struct rk29_i2c_data {
void __iomem *regs;
struct resource *ioarea;
unsigned int ack_timeout; //unit: us
unsigned int udelay_time; //unit: us
unsigned int suspended:1;
unsigned long scl_rate;
unsigned long i2c_rate;
@ -242,13 +253,13 @@ static irqreturn_t rk29_i2c_irq(int irq, void *data)
}
static int wait_for_completion_poll_timeout(struct rk29_i2c_data *i2c)
{
int tmo = 10000;
int tmo = RK29_I2C_ACK_TIMEOUT_COUNT;
while(--tmo)
{
if(i2c->poll_status == 1)
return 1;
udelay(400*1000/i2c->scl_rate);
udelay(i2c->udelay_time);
}
return 0;
}
@ -267,9 +278,8 @@ static int rk29_wait_event(struct rk29_i2c_data *i2c,
rk29_i2c_enable_irqs(i2c);
if(i2c->mode == I2C_MODE_IRQ)
{
init_completion(&i2c->cmd_complete);
ret = wait_for_completion_interruptible_timeout(&i2c->cmd_complete,
RK29_I2C_TIMEOUT(4000 * 1000/i2c->scl_rate));
usecs_to_jiffies(i2c->ack_timeout));
}
else
{
@ -292,12 +302,12 @@ static int rk29_wait_event(struct rk29_i2c_data *i2c,
static void rk29_i2c_stop(struct rk29_i2c_data *i2c)
{
int tmo = 10000 * 1000/i2c->scl_rate;
int tmo = RK29_I2C_STOP_TIMEOUT_COUNT;
writel(I2C_LCMR_STOP|I2C_LCMR_RESUME, i2c->regs + I2C_LCMR);
while(--tmo && !(readl(i2c->regs + I2C_LCMR) & I2C_LCMR_STOP))
{
udelay(400*1000/i2c->scl_rate);
udelay(i2c->udelay_time);
}
writel(0, i2c->regs + I2C_ISR);
rk29_i2c_disable_irqs(i2c);
@ -307,11 +317,11 @@ static void rk29_i2c_stop(struct rk29_i2c_data *i2c)
}
static void rk29_wait_while_busy(struct rk29_i2c_data *i2c)
{
int tmo = 10000 * 1000/i2c->scl_rate;
int tmo = RK29_I2C_START_TIMEOUT_COUNT;
while(--tmo && (readl(i2c->regs + I2C_LSR) & I2C_LSR_BUSY))
{
udelay(400*1000/i2c->scl_rate);
udelay(i2c->udelay_time);
}
return;
}
@ -325,6 +335,8 @@ static int rk29_send_2nd_addr(struct rk29_i2c_data *i2c,
i2c_dbg(i2c->dev, "i2c send addr_2nd: %lx\n", addr_2nd);
writel(addr_2nd, i2c->regs + I2C_MTXR);
if(i2c->mode == I2C_MODE_IRQ)
INIT_COMPLETION(i2c->cmd_complete);
writel(I2C_LCMR_RESUME, i2c->regs + I2C_LCMR);
rk29_set_ack(i2c);
@ -367,6 +379,8 @@ static int rk29_send_address(struct rk29_i2c_data *i2c,
i2c_dbg(i2c->dev, "i2c send addr_1st: %lx\n", addr_1st);
writel(addr_1st, i2c->regs + I2C_MTXR);
rk29_set_ack(i2c);
if(i2c->mode == I2C_MODE_IRQ)
INIT_COMPLETION(i2c->cmd_complete);
writel(I2C_LCMR_START|I2C_LCMR_RESUME, i2c->regs + I2C_LCMR);
if((ret = rk29_wait_event(i2c, RK29_EVENT_MTX_RCVD_ACK)) != 0)
@ -400,6 +414,8 @@ static int rk29_i2c_send_msg(struct rk29_i2c_data *i2c, struct i2c_msg *msg)
i2c_dbg(i2c->dev, "i2c send buf[%d]: %x\n", i, msg->buf[i]);
writel(msg->buf[i], i2c->regs + I2C_MTXR);
rk29_set_ack(i2c);
if(i2c->mode == I2C_MODE_IRQ)
INIT_COMPLETION(i2c->cmd_complete);
writel(I2C_LCMR_RESUME, i2c->regs + I2C_LCMR);
if((ret = rk29_wait_event(i2c, RK29_EVENT_MTX_RCVD_ACK)) != 0)
@ -423,6 +439,8 @@ static int rk29_i2c_recv_msg(struct rk29_i2c_data *i2c, struct i2c_msg *msg)
for(i = 0; i < msg->len; i++)
{
if(i2c->mode == I2C_MODE_IRQ)
INIT_COMPLETION(i2c->cmd_complete);
writel(I2C_LCMR_RESUME, i2c->regs + I2C_LCMR);
if((ret = rk29_wait_event(i2c, RK29_EVENT_MRX_NEED_ACK)) != 0)
return ret;
@ -499,6 +517,8 @@ static int rk29_i2c_xfer(struct i2c_adapter *adap,
i2c->scl_rate = 400000;
rk29_i2c_clockrate(i2c);
i2c->udelay_time = RK29_UDELAY_TIME(i2c->scl_rate);
i2c->ack_timeout = RK29_I2C_ACK_TIMEOUT_COUNT * i2c->udelay_time;
for (i = 0; i < num; i++)
{
ret = rk29_xfer_msg(adap, &msgs[i], (i == 0), (i == (num - 1)));
@ -642,6 +662,7 @@ static int rk29_i2c_probe(struct platform_device *pdev)
i2c_err(&pdev->dev, "<error>no memory for state\n");
return -ENOMEM;
}
init_completion(&i2c->cmd_complete);
i2c->retry = RETRY_NUM;
i2c->mode = pdata->mode;
i2c->scl_rate = (pdata->scl_rate) ? pdata->scl_rate : 100000;