Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-18 23:19:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

i2c: designware_i2c: remove 'has_high_speed'

Browse source 
Remove 'has_high_speed' config since we can check high speed support
from IC_COMP_PARAM_1 register.

Signed-off-by: Jun Chen <ptchentw@gmail.com>
Signed-off-by: Jun Chen <jun.chen@vatics.com>
This commit is contained in:
Jun Chen 2020-03-02 16:58:56 +08:00 • committed by Heiko Schocher
parent 565e328b95
commit be26342314
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/i2c/designware_i2c.c
View file

@ -212,8 +212,7 @@ static int calc_bus_speed(struct dw_i2c *priv, int speed, ulong bus_clk,
if (priv) if (priv)
scl_sda_cfg = priv->scl_sda_cfg; scl_sda_cfg = priv->scl_sda_cfg;
/* Allow high 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_SPEED_HIGH_RATE && if (speed >= I2C_SPEED_HIGH_RATE)
(!scl_sda_cfg || scl_sda_cfg->has_high_speed))
i2c_spd = IC_SPEED_MODE_HIGH; i2c_spd = IC_SPEED_MODE_HIGH;
else if (speed >= I2C_SPEED_FAST_PLUS_RATE) else if (speed >= I2C_SPEED_FAST_PLUS_RATE)
i2c_spd = IC_SPEED_MODE_FAST_PLUS; i2c_spd = IC_SPEED_MODE_FAST_PLUS;

2
drivers/i2c/designware_i2c.h
View file

@ -144,7 +144,6 @@ struct i2c_regs {
/** /**
* struct dw_scl_sda_cfg - I2C timing configuration * struct dw_scl_sda_cfg - I2C timing configuration
* *
* @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
@ -152,7 +151,6 @@ 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_high_speed;
u32 ss_hcnt; u32 ss_hcnt;
u32 fs_hcnt; u32 fs_hcnt;
u32 ss_lcnt; u32 ss_lcnt;