diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-09-14 22:54:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-14 22:54:45 +0100 |
| commit | da16e3245a4827d969943ca0493a4a6e34009342 (patch) | |
| tree | 00d2148416dd6d388d9a2fe3fcf6adbc825128f4 /drivers/i2c | |
| parent | d8ac10639b6a1ed900efbee38c18baaca31e64dc (diff) | |
| download | talos-obmc-linux-da16e3245a4827d969943ca0493a4a6e34009342.tar.gz talos-obmc-linux-da16e3245a4827d969943ca0493a4a6e34009342.zip | |
[I2C] Add a functionality method, and remove algorithm ids
This allows i2c-pxa to finally build.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index fdf53ce04248..44b595d90a4a 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -914,19 +914,23 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num 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 = { - .name = "PXA-I2C-Algorithm", - .id = I2C_ALGO_PXA, .master_xfer = i2c_pxa_xfer, + .functionality = i2c_pxa_functionality, }; static struct pxa_i2c i2c_pxa = { .lock = SPIN_LOCK_UNLOCKED, .wait = __WAIT_QUEUE_HEAD_INITIALIZER(i2c_pxa.wait), .adap = { - .name = "pxa2xx-i2c", - .id = I2C_ALGO_PXA, + .owner = THIS_MODULE, .algo = &i2c_pxa_algorithm, + .name = "pxa2xx-i2c", .retries = 5, }, }; |
