diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-20 05:14:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-20 05:14:01 -0400 |
| commit | 09849f4a7779a247be8af5cfae44f7aad30e1222 (patch) | |
| tree | 50891a9305714eff354702443555f52f1a65463c /drivers/i2c/rk_i2c.c | |
| parent | 7c8ef0feb97586d35b0296b48903daef8c06ab21 (diff) | |
| parent | 135aa95002646c46e89de93fa36adad1b010548f (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/i2c/rk_i2c.c')
| -rw-r--r-- | drivers/i2c/rk_i2c.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index 3fceade61ec..63b141838b6 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -29,10 +29,9 @@ DECLARE_GLOBAL_DATA_PTR; #define RK_I2C_FIFO_SIZE 32 struct rk_i2c { - struct udevice *clk; + struct clk clk; struct i2c_regs *regs; unsigned int speed; - int clk_id; }; static inline void rk_i2c_get_div(int div, int *divh, int *divl) @@ -55,7 +54,7 @@ static void rk_i2c_set_clk(struct rk_i2c *i2c, uint32_t scl_rate) int div, divl, divh; /* First get i2c rate from pclk */ - i2c_rate = clk_get_periph_rate(i2c->clk, i2c->clk_id); + i2c_rate = clk_get_rate(&i2c->clk); div = DIV_ROUND_UP(i2c_rate, scl_rate * 8) - 2; divh = 0; @@ -362,7 +361,6 @@ static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) bus->name, ret); return ret; } - priv->clk_id = ret; return 0; } |