diff options
| author | Zhangfei Gao <zhangfei.gao@linaro.org> | 2013-01-31 16:31:57 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-02-21 16:12:29 +0800 |
| commit | d53a8ef37e5e56bc74371cafbb9b8dbb2ec47a1f (patch) | |
| tree | b394dadbf023f6a9bf619824684a3ccaee34fc3f | |
| parent | 9fb28f956692ef4ac1c85d90b4ab4a62cc295027 (diff) | |
i2c-designware: support no DW_IC_COMP_TYPE platform
Check accessor_flags before reading DW_IC_COMP_TYPE
Give chance to platform no such register
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.c | 24 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.h | 1 |
2 files changed, 14 insertions, 11 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index f5258c205de5..2b1094f32da9 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -264,17 +264,19 @@ int i2c_dw_init(struct dw_i2c_dev *dev) input_clock_khz = dev->get_clk_rate_khz(dev); - reg = dw_readl(dev, DW_IC_COMP_TYPE); - if (reg == ___constant_swab32(DW_IC_COMP_TYPE_VALUE)) { - /* Configure register endianess access */ - dev->accessor_flags |= ACCESS_SWAP; - } else if (reg == (DW_IC_COMP_TYPE_VALUE & 0x0000ffff)) { - /* Configure register access mode 16bit */ - dev->accessor_flags |= ACCESS_16BIT; - } else if (reg != DW_IC_COMP_TYPE_VALUE) { - dev_err(dev->dev, "Unknown Synopsys component type: " - "0x%08x\n", reg); - return -ENODEV; + if (!dev->accessor_flags) { + reg = dw_readl(dev, DW_IC_COMP_TYPE); + if (reg == ___constant_swab32(DW_IC_COMP_TYPE_VALUE)) { + /* Configure register endianess access */ + dev->accessor_flags |= ACCESS_SWAP; + } else if (reg == (DW_IC_COMP_TYPE_VALUE & 0x0000ffff)) { + /* Configure register access mode 16bit */ + dev->accessor_flags |= ACCESS_16BIT; + } else if (reg != DW_IC_COMP_TYPE_VALUE) { + dev_err(dev->dev, "Unknown Synopsys component type: " + "0x%08x\n", reg); + return -ENODEV; + } } /* Disable the adapter */ diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 9c1840ee09c7..f4efd1ac419c 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -92,6 +92,7 @@ struct dw_i2c_dev { #define ACCESS_SWAP 0x00000001 #define ACCESS_16BIT 0x00000002 +#define ACCESS_32BIT 0x00000004 extern u32 dw_readl(struct dw_i2c_dev *dev, int offset); extern void dw_writel(struct dw_i2c_dev *dev, u32 b, int offset); |