iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c-designware: move controller config to bus specific portion of driver

Browse Source 
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>
This commit is contained in:
Dirk Brandewie 2011-10-06 11:26:32 -07:00 committed by Ben Dooks
parent 2fa8326b4b
commit e18563fc56
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/busses/i2c-designware-core.c
View File

@ -143,7 +143,7 @@ static u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
int i2c_dw_init(struct dw_i2c_dev *dev) int i2c_dw_init(struct dw_i2c_dev *dev)
{ {
u32 input_clock_khz; u32 input_clock_khz;
u32 ic_con, hcnt, lcnt; u32 hcnt, lcnt;
u32 reg; u32 reg;
input_clock_khz = dev->get_clk_rate_khz(dev); input_clock_khz = dev->get_clk_rate_khz(dev);
@ -199,9 +199,7 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
dw_writel(dev, 0, DW_IC_RX_TL); dw_writel(dev, 0, DW_IC_RX_TL);
/* configure the i2c master */ /* configure the i2c master */
ic_con = DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE | dw_writel(dev, dev->master_cfg , DW_IC_CON);
DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_FAST;
dw_writel(dev, ic_con, DW_IC_CON);
return 0; return 0;
} }

1
drivers/i2c/busses/i2c-designware-core.h
View File

@ -183,6 +183,7 @@ struct dw_i2c_dev {
int swab; int swab;
struct i2c_adapter adapter; struct i2c_adapter adapter;
u32 functionality; u32 functionality;
u32 master_cfg;
unsigned int tx_fifo_depth; unsigned int tx_fifo_depth;
unsigned int rx_fifo_depth; unsigned int rx_fifo_depth;
}; };

2
drivers/i2c/busses/i2c-designware-platdrv.c
View File

@ -103,6 +103,8 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_WORD_DATA |
I2C_FUNC_SMBUS_I2C_BLOCK; 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)); dev->base = ioremap(mem->start, resource_size(mem));
if (dev->base == NULL) { if (dev->base == NULL) {