diff options
| author | Dirk Brandewie | 2011-10-06 20:26:32 +0200 |
|---|---|---|
| committer | Ben Dooks | 2011-10-29 12:03:50 +0200 |
| commit | e18563fc560aba0d95a5a73145812a081fb38fac (patch) | |
| tree | a244326e1d17deb93958bee1e10fed9acdfe8eb2 /drivers/i2c/busses/i2c-designware-platdrv.c | |
| parent | i2c-designware: move i2c functionality bit field to be adapter specific (diff) | |
| download | kernel-qcow2-linux-e18563fc560aba0d95a5a73145812a081fb38fac.tar.gz kernel-qcow2-linux-e18563fc560aba0d95a5a73145812a081fb38fac.tar.xz kernel-qcow2-linux-e18563fc560aba0d95a5a73145812a081fb38fac.zip | |
i2c-designware: move controller config to bus specific portion of driver
With multiple I2C adapters possible in the system each running at
(possibly) different speeds we need to move the controller
configuration bit field to the adapter.
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-platdrv.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 36db7a80cbb2..1258cae3555d 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -103,6 +103,8 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev) I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_I2C_BLOCK; + dev->master_cfg = DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE | + DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_FAST; dev->base = ioremap(mem->start, resource_size(mem)); if (dev->base == NULL) { |