Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-i2c

Browse Source
This commit is contained in:
Linus Torvalds 2005-09-14 15:20:04 -07:00
commit 77b2555b52
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/i2c/busses/i2c-pxa.c
View File

@ -914,19 +914,23 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
return ret; return ret;
} }
static u32 i2c_pxa_functionality(struct i2c_adapter *adap)
{
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
static struct i2c_algorithm i2c_pxa_algorithm = { static struct i2c_algorithm i2c_pxa_algorithm = {
.name = "PXA-I2C-Algorithm",
.id = I2C_ALGO_PXA,
.master_xfer = i2c_pxa_xfer, .master_xfer = i2c_pxa_xfer,
.functionality = i2c_pxa_functionality,
}; };
static struct pxa_i2c i2c_pxa = { static struct pxa_i2c i2c_pxa = {
.lock = SPIN_LOCK_UNLOCKED, .lock = SPIN_LOCK_UNLOCKED,
.wait = __WAIT_QUEUE_HEAD_INITIALIZER(i2c_pxa.wait), .wait = __WAIT_QUEUE_HEAD_INITIALIZER(i2c_pxa.wait),
.adap = { .adap = {
.name = "pxa2xx-i2c", .owner = THIS_MODULE,
.id = I2C_ALGO_PXA,
.algo = &i2c_pxa_algorithm, .algo = &i2c_pxa_algorithm,
.name = "pxa2xx-i2c",
.retries = 5, .retries = 5,
}, },
}; };