diff options
| author | Stefan Roese <sr@denx.de> | 2016-04-21 08:19:39 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2016-04-25 07:31:28 +0200 |
| commit | 11b544ab419971bb829135743dab3397fb43db21 (patch) | |
| tree | 658b536dc2a04947fa3734a3e841db7dfd8cf1d4 /drivers/i2c | |
| parent | 1c8b089b45cddeef6fb76d9abb8d48601ec5e0a1 (diff) | |
| download | blackbird-obmc-uboot-11b544ab419971bb829135743dab3397fb43db21.tar.gz blackbird-obmc-uboot-11b544ab419971bb829135743dab3397fb43db21.zip | |
i2c: designware_i2c: Integrate set_speed() into dw_i2c_set_bus_speed()
Integrating set_speed() into dw_i2c_set_bus_speed() will make the
conversion to DM easier for this driver.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/designware_i2c.c | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index d5b3e29e88..035bf23dfc 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -56,16 +56,25 @@ static void dw_i2c_enable(struct i2c_regs *i2c_base, bool enable) } /* - * set_speed - Set the i2c speed mode (standard, high, fast) - * @i2c_spd: required i2c speed mode + * i2c_set_bus_speed - Set the i2c speed + * @speed: required i2c speed * - * Set the i2c speed mode (standard, high, fast) + * Set the i2c speed. */ -static void set_speed(struct i2c_adapter *adap, int i2c_spd) +static unsigned int dw_i2c_set_bus_speed(struct i2c_adapter *adap, + unsigned int speed) { struct i2c_regs *i2c_base = i2c_get_base(adap); unsigned int cntl; unsigned int hcnt, lcnt; + int i2c_spd; + + if (speed >= I2C_MAX_SPEED) + i2c_spd = IC_SPEED_MODE_MAX; + else if (speed >= I2C_FAST_SPEED) + i2c_spd = IC_SPEED_MODE_FAST; + else + i2c_spd = IC_SPEED_MODE_STANDARD; /* to set speed cltr must be disabled */ dw_i2c_enable(i2c_base, false); @@ -103,27 +112,7 @@ static void set_speed(struct i2c_adapter *adap, int i2c_spd) /* Enable back i2c now speed set */ dw_i2c_enable(i2c_base, true); -} - -/* - * i2c_set_bus_speed - Set the i2c speed - * @speed: required i2c speed - * - * Set the i2c speed. - */ -static unsigned int dw_i2c_set_bus_speed(struct i2c_adapter *adap, - unsigned int speed) -{ - int i2c_spd; - - if (speed >= I2C_MAX_SPEED) - i2c_spd = IC_SPEED_MODE_MAX; - else if (speed >= I2C_FAST_SPEED) - i2c_spd = IC_SPEED_MODE_FAST; - else - i2c_spd = IC_SPEED_MODE_STANDARD; - set_speed(adap, i2c_spd); adap->speed = speed; return 0; |
