History

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang: "Some driver bugfixes for the I2C subsystem" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: mv64xxx: Document the newly introduced allwinner compatible i2c: Fix Kontron PLD prescaler calculation i2c: i2c-mxs: Use DMA mode even for small transfers

Linus Torvalds committed 13 years ago

Commit 9e6bdaa2 parents d92581f f480ada3 files · +4 −4Browse files

Unified · Split

3 files
  1. Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt +1 −1
  2. drivers/i2c/busses/i2c-kempld.c +2 −2
  3. drivers/i2c/busses/i2c-mxs.c +1 −1
Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
4Required properties :4Required properties :
5 5
6 - reg : Offset and length of the register set for the device6 - reg : Offset and length of the register set for the device
7 - compatible : Should be "marvell,mv64xxx-i2c"7 - compatible : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"
8 - interrupts : The interrupt number8 - interrupts : The interrupt number
9 9
10Optional properties :10Optional properties :
drivers/i2c/busses/i2c-kempld.c+2−2
@@ -246,9 +246,9 @@ static void kempld_i2c_device_init(struct kempld_i2c_data *i2c) · 245 unmodified lines
246 bus_frequency = KEMPLD_I2C_FREQ_MAX;246 bus_frequency = KEMPLD_I2C_FREQ_MAX;
247 247
248 if (pld->info.spec_major == 1)248 if (pld->info.spec_major == 1)
249 prescale = pld->pld_clock / bus_frequency * 5 - 1000;249 prescale = pld->pld_clock / (bus_frequency * 5) - 1000;
250 else250 else
251 prescale = pld->pld_clock / bus_frequency * 4 - 3000;251 prescale = pld->pld_clock / (bus_frequency * 4) - 3000;
252 252
253 if (prescale < 0)253 if (prescale < 0)
254 prescale = 0;254 prescale = 0;
drivers/i2c/busses/i2c-mxs.c+1−1
@@ -493,7 +493,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, · 492 unmodified lines
493 * based on this empirical measurement and a lot of previous frobbing.493 * based on this empirical measurement and a lot of previous frobbing.
494 */494 */
495 i2c->cmd_err = 0;495 i2c->cmd_err = 0;
496 if (msg->len < 8) {496 if (0) { /* disable PIO mode until a proper fix is made */
497 ret = mxs_i2c_pio_setup_xfer(adap, msg, flags);497 ret = mxs_i2c_pio_setup_xfer(adap, msg, flags);
498 if (ret)498 if (ret)
499 mxs_i2c_reset(i2c);499 mxs_i2c_reset(i2c);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t