Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: designware_i2c: Integrate set_speed() into dw_i2c_set_bus_speed()

Browse source 
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>
This commit is contained in:
Stefan Roese 2016-04-21 08:19:39 +02:00 • committed by Heiko Schocher
parent 1c8b089b45
commit 11b544ab41
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/i2c/designware_i2c.c
View file

@ -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_set_bus_speed - Set the i2c speed
* @i2c_spd: required i2c speed mode * @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); struct i2c_regs *i2c_base = i2c_get_base(adap);
unsigned int cntl; unsigned int cntl;
unsigned int hcnt, lcnt; 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 */ /* to set speed cltr must be disabled */
dw_i2c_enable(i2c_base, false); 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 */ /* Enable back i2c now speed set */
dw_i2c_enable(i2c_base, true); 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; adap->speed = speed;
return 0; return 0;