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

i2c: designware_i2c: Rename 'max' speed to 'high' speed

Browse source 
Some SoCs support a higher speed than what is currently called 'max' in
this driver. Rename it to 'high' speed, which is the official name of the
3.4MHz speed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jun Chen <ptchentw@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Simon Glass 2020-01-23 11:48:07 -07:00 • committed by Heiko Schocher
parent afb88651a6
commit 6db7943b92
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/i2c/designware_i2c.c
View file

@ -62,10 +62,10 @@ static unsigned int __dw_i2c_set_bus_speed(struct i2c_regs *i2c_base,
unsigned int ena; unsigned int ena;
int i2c_spd; int i2c_spd;
/* Allow max speed if there is no config, or the config allows it */ /* Allow high speed if there is no config, or the config allows it */
if (speed >= I2C_MAX_SPEED && if (speed >= I2C_HIGH_SPEED &&
(!scl_sda_cfg || scl_sda_cfg->has_max_speed)) (!scl_sda_cfg || scl_sda_cfg->has_high_speed))
i2c_spd = IC_SPEED_MODE_MAX; i2c_spd = IC_SPEED_MODE_HIGH;
else if (speed >= I2C_FAST_SPEED) else if (speed >= I2C_FAST_SPEED)
i2c_spd = IC_SPEED_MODE_FAST; i2c_spd = IC_SPEED_MODE_FAST;
else else
@ -80,7 +80,7 @@ static unsigned int __dw_i2c_set_bus_speed(struct i2c_regs *i2c_base,
cntl = (readl(&i2c_base->ic_con) & (~IC_CON_SPD_MSK)); cntl = (readl(&i2c_base->ic_con) & (~IC_CON_SPD_MSK));
switch (i2c_spd) { switch (i2c_spd) {
case IC_SPEED_MODE_MAX: case IC_SPEED_MODE_HIGH:
cntl |= IC_CON_SPD_SS; cntl |= IC_CON_SPD_SS;
if (scl_sda_cfg) { if (scl_sda_cfg) {
hcnt = scl_sda_cfg->fs_hcnt; hcnt = scl_sda_cfg->fs_hcnt;

8
drivers/i2c/designware_i2c.h
View file

@ -138,16 +138,16 @@ struct i2c_regs {
/* Speed Selection */ /* Speed Selection */
#define IC_SPEED_MODE_STANDARD 1 #define IC_SPEED_MODE_STANDARD 1
#define IC_SPEED_MODE_FAST 2 #define IC_SPEED_MODE_FAST 2
#define IC_SPEED_MODE_MAX 3 #define IC_SPEED_MODE_HIGH 3
#define I2C_MAX_SPEED 3400000 #define I2C_HIGH_SPEED 3400000
#define I2C_FAST_SPEED 400000 #define I2C_FAST_SPEED 400000
#define I2C_STANDARD_SPEED 100000 #define I2C_STANDARD_SPEED 100000
/** /**
* struct dw_scl_sda_cfg - I2C timing configuration * struct dw_scl_sda_cfg - I2C timing configuration
* *
* @has_max_speed: Support maximum speed (1Mbps) * @has_high_speed: Support high speed (3.4Mbps)
* @ss_hcnt: Standard speed high time in ns * @ss_hcnt: Standard speed high time in ns
* @fs_hcnt: Fast speed high time in ns * @fs_hcnt: Fast speed high time in ns
* @ss_lcnt: Standard speed low time in ns * @ss_lcnt: Standard speed low time in ns
@ -155,7 +155,7 @@ struct i2c_regs {
* @sda_hold: SDA hold time * @sda_hold: SDA hold time
*/ */
struct dw_scl_sda_cfg { struct dw_scl_sda_cfg {
bool has_max_speed; bool has_high_speed;
u32 ss_hcnt; u32 ss_hcnt;
u32 fs_hcnt; u32 fs_hcnt;
u32 ss_lcnt; u32 ss_lcnt;