Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
i2c-s3c2410: fix calculation of SDA line delay
i2c-davinci: Fix race when setting up for TX
i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout
+6
-6
+3
-3
drivers/i2c/busses/i2c-davinci.c
+3
-3
drivers/i2c/busses/i2c-davinci.c
···
357
357
358
358
dev->terminate = 0;
359
359
360
-
/* write the data into mode register */
361
-
davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
362
-
363
360
/*
364
361
* First byte should be set here, not after interrupt,
365
362
* because transmit-data-ready interrupt can come before
···
367
370
davinci_i2c_write_reg(dev, DAVINCI_I2C_DXR_REG, *dev->buf++);
368
371
dev->buf_len--;
369
372
}
373
+
374
+
/* write the data into mode register; start transmitting */
375
+
davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
370
376
371
377
r = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
372
378
dev->adapter.timeout);
+1
-1
drivers/i2c/busses/i2c-octeon.c
+1
-1
drivers/i2c/busses/i2c-octeon.c
+2
-2
drivers/i2c/busses/i2c-s3c2410.c
+2
-2
drivers/i2c/busses/i2c-s3c2410.c
···
662
662
unsigned long sda_delay;
663
663
664
664
if (pdata->sda_delay) {
665
-
sda_delay = (freq / 1000) * pdata->sda_delay;
666
-
sda_delay /= 1000000;
665
+
sda_delay = clkin * pdata->sda_delay;
666
+
sda_delay = DIV_ROUND_UP(sda_delay, 1000000);
667
667
sda_delay = DIV_ROUND_UP(sda_delay, 5);
668
668
if (sda_delay > 3)
669
669
sda_delay = 3;