Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099ce8f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 90768c09 fa16eefd

drivers/i2c/busses/i2c-davinci.c

+6 −11
Original line number Diff line number Diff line
@@ -382,9 +382,8 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) 
			break;



		case DAVINCI_I2C_IVR_ARDY:

			w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG);

			MOD_REG_BIT(w, DAVINCI_I2C_STR_ARDY, 1);

			davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w);

			davinci_i2c_write_reg(dev,

				DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_ARDY);

			complete(&dev->cmd_complete);

			break;
@@ -397,12 +396,9 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) 
				if (dev->buf_len)

					continue;



				w = davinci_i2c_read_reg(dev,

							 DAVINCI_I2C_STR_REG);

				MOD_REG_BIT(w, DAVINCI_I2C_IMR_RRDY, 0);

				davinci_i2c_write_reg(dev,

					DAVINCI_I2C_STR_REG,

						      w);

					DAVINCI_I2C_IMR_RRDY);

			} else

				dev_err(dev->dev, "RDR IRQ while no "

					"data requested\n");
@@ -428,9 +424,8 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id) 
			break;



		case DAVINCI_I2C_IVR_SCD:

			w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG);

			MOD_REG_BIT(w, DAVINCI_I2C_STR_SCD, 1);

			davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w);

			davinci_i2c_write_reg(dev,

				DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_SCD);

			complete(&dev->cmd_complete);

			break;

drivers/i2c/busses/i2c-ibm_iic.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(iic_force_poll, "Force polling mode"); 


static int iic_force_fast;

module_param(iic_force_fast, bool, 0);

MODULE_PARM_DESC(iic_fast_poll, "Force fast mode (400 kHz)");

MODULE_PARM_DESC(iic_force_fast, "Force fast mode (400 kHz)");



#define DBG_LEVEL 0

drivers/i2c/busses/i2c-tiny-usb.c

+8 −4
Original line number Diff line number Diff line
@@ -131,10 +131,14 @@ static const struct i2c_algorithm usb_algorithm = { 


/* ----- begin of usb layer ---------------------------------------------- */



/* The usb i2c interface uses a vid/pid pair donated by */

/* Future Technology Devices International Ltd. */

/*

 * Initially the usb i2c interface uses a vid/pid pair donated by

 * Future Technology Devices International Ltd., later a pair was

 * bought from EZPrototypes

 */

static struct usb_device_id i2c_tiny_usb_table [] = {

	{ USB_DEVICE(0x0403, 0xc631) },

	{ USB_DEVICE(0x0403, 0xc631) },   /* FTDI */

	{ USB_DEVICE(0x1c40, 0x0534) },   /* EZPrototypes */

	{ }                               /* Terminating entry */

};