From: Dirk Brandewie <[email protected]> x86 does not have clk_dev support. The PCI variant of the driver sets the clock rate being supplied to the IP block based on config information attached to the PCI ID
Signed-off-by: Dirk Brandewie <[email protected]> --- drivers/i2c/busses/i2c-designware-core.c | 14 ++++++++++++-- drivers/i2c/busses/i2c-designware-core.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index a0d1ea3..ba0683d 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -58,6 +58,15 @@ static char *abort_sources[] = { "lost arbitration", }; +u32 i2c_dw_clk_get_rate(struct dw_i2c_dev *dev) +{ +#ifndef CONFIG_HAVE_CLK + return dev->clk_khz; +#else + return clk_get_rate(dev->clk)/1000; +#endif +} + u32 dw_readl(struct dw_i2c_dev *dev, int offset) { u32 value = readl(dev->base + offset); @@ -76,7 +85,6 @@ void dw_writel(struct dw_i2c_dev *dev, u32 b, int offset) writel(b, dev->base + offset); } - static u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset) { @@ -142,10 +150,12 @@ static u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset) */ int i2c_dw_init(struct dw_i2c_dev *dev) { - u32 input_clock_khz = clk_get_rate(dev->clk) / 1000; + u32 input_clock_khz; u32 ic_con, hcnt, lcnt; u32 reg; + input_clock_khz = i2c_dw_clk_get_rate(dev); + /* Configure register endianess access */ reg = dw_readl(dev, DW_IC_COMP_TYPE); if (reg == ___constant_swab32(DW_IC_COMP_TYPE_VALUE)) { diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 4e37031..596f069 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -166,6 +166,7 @@ struct dw_i2c_dev { struct completion cmd_complete; struct mutex lock; struct clk *clk; + u32 clk_khz; int cmd_err; struct i2c_msg *msgs; int msgs_num; -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
