dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

i2c-designware: move i2c functionality bit field to be adapter specific 

The functionality of the adapter depends on the configuration of the
IP block at silicon compile time and is adapter specific.

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:31 -07:00 committed by Ben Dooks
parent 1d31b58f64
commit 2fa8326b4b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,12 +457,8 @@ done:
u32 i2c_dw_func(struct i2c_adapter *adap)
{
return I2C_FUNC_I2C |
I2C_FUNC_10BIT_ADDR |
I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA |
I2C_FUNC_SMBUS_I2C_BLOCK;
struct dw_i2c_dev *dev = i2c_get_adapdata(adap);
return dev->functionality;
}
static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev)

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

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

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

@ -96,6 +96,14 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
}
clk_enable(dev->clk);
dev->functionality =
I2C_FUNC_I2C |
I2C_FUNC_10BIT_ADDR |
I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA |
I2C_FUNC_SMBUS_I2C_BLOCK;
dev->base = ioremap(mem->start, resource_size(mem));
if (dev->base == NULL) {
dev_err(&pdev->dev, "failure mapping io resources\n");