Skip to content

Commit

Permalink
i2c-designware: Check component type register
Browse files Browse the repository at this point in the history
Designware component type register is checked before attaching to the device.

Signed-off-by: Jean-Hugues Deschenes <jean-hugues.deschenes@octasic.com>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Jean-Hugues Deschenes authored and Ben Dooks committed Oct 29, 2011
1 parent 7f27960 commit 4ff895b
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions drivers/i2c/busses/i2c-designware.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
#define DW_IC_TXFLR 0x74
#define DW_IC_RXFLR 0x78
#define DW_IC_COMP_PARAM_1 0xf4
#define DW_IC_COMP_TYPE 0xfc
#define DW_IC_TX_ABRT_SOURCE 0x80

#define DW_IC_CON_MASTER 0x1
Expand Down Expand Up @@ -710,6 +711,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
struct i2c_adapter *adap;
struct resource *mem, *ioarea;
int irq, r;
u32 reg;

/* NOTE: driver uses the static register mapping */
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand Down Expand Up @@ -756,12 +758,19 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
r = -EBUSY;
goto err_unuse_clocks;
}
{
u32 param1 = dw_readl(dev, DW_IC_COMP_PARAM_1);

dev->tx_fifo_depth = ((param1 >> 16) & 0xff) + 1;
dev->rx_fifo_depth = ((param1 >> 8) & 0xff) + 1;
reg = dw_readl(dev, DW_IC_COMP_TYPE);
if (reg != 0x44570140) {
dev_err(&pdev->dev, "Unknown Synopsys component type: "
"0x%08x\n", reg);
r = -ENODEV;
goto err_iounmap;
}

reg = dw_readl(dev, DW_IC_COMP_PARAM_1);
dev->tx_fifo_depth = ((reg >> 16) & 0xff) + 1;
dev->rx_fifo_depth = ((reg >> 8) & 0xff) + 1;

i2c_dw_init(dev);

dw_writel(dev, 0, DW_IC_INTR_MASK); /* disable IRQ */
Expand Down

0 comments on commit 4ff895b

Please sign in to comment.