Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-tiny-usb: New VID/PID pair
i2c-davinci: Fix lost interrupt
i2c-ibm_iic: Fast mode parm desc fixup
+15
-16
+6
-11
drivers/i2c/busses/i2c-davinci.c
+6
-11
drivers/i2c/busses/i2c-davinci.c
···
382
382
break;
383
383
384
384
case DAVINCI_I2C_IVR_ARDY:
385
-
w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG);
386
-
MOD_REG_BIT(w, DAVINCI_I2C_STR_ARDY, 1);
387
-
davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w);
385
+
davinci_i2c_write_reg(dev,
386
+
DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_ARDY);
388
387
complete(&dev->cmd_complete);
389
388
break;
390
389
···
396
397
if (dev->buf_len)
397
398
continue;
398
399
399
-
w = davinci_i2c_read_reg(dev,
400
-
DAVINCI_I2C_STR_REG);
401
-
MOD_REG_BIT(w, DAVINCI_I2C_IMR_RRDY, 0);
402
400
davinci_i2c_write_reg(dev,
403
-
DAVINCI_I2C_STR_REG,
404
-
w);
401
+
DAVINCI_I2C_STR_REG,
402
+
DAVINCI_I2C_IMR_RRDY);
405
403
} else
406
404
dev_err(dev->dev, "RDR IRQ while no "
407
405
"data requested\n");
···
424
428
break;
425
429
426
430
case DAVINCI_I2C_IVR_SCD:
427
-
w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG);
428
-
MOD_REG_BIT(w, DAVINCI_I2C_STR_SCD, 1);
429
-
davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w);
431
+
davinci_i2c_write_reg(dev,
432
+
DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_SCD);
430
433
complete(&dev->cmd_complete);
431
434
break;
432
435
+1
-1
drivers/i2c/busses/i2c-ibm_iic.c
+1
-1
drivers/i2c/busses/i2c-ibm_iic.c
+8
-4
drivers/i2c/busses/i2c-tiny-usb.c
+8
-4
drivers/i2c/busses/i2c-tiny-usb.c
···
131
131
132
132
/* ----- begin of usb layer ---------------------------------------------- */
133
133
134
-
/* The usb i2c interface uses a vid/pid pair donated by */
135
-
/* Future Technology Devices International Ltd. */
134
+
/*
135
+
* Initially the usb i2c interface uses a vid/pid pair donated by
136
+
* Future Technology Devices International Ltd., later a pair was
137
+
* bought from EZPrototypes
138
+
*/
136
139
static struct usb_device_id i2c_tiny_usb_table [] = {
137
-
{ USB_DEVICE(0x0403, 0xc631) },
138
-
{ } /* Terminating entry */
140
+
{ USB_DEVICE(0x0403, 0xc631) }, /* FTDI */
141
+
{ USB_DEVICE(0x1c40, 0x0534) }, /* EZPrototypes */
142
+
{ } /* Terminating entry */
139
143
};
140
144
141
145
MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table);