| Message ID | 1583139537-65602-4-git-send-email-ptchentw@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | i2c: designware_i2c: Improvements for high speed mode | expand |
Hello Jun Chen, Am 02.03.2020 um 09:58 schrieb Jun Chen: > From: Jun Chen <jun.chen at vatics.com> > > Remove 'has_high_speed' config since we can check high speed support > from IC_COMP_PARAM_1 register. > > Signed-off-by: Jun Chen <ptchentw at gmail.com> > Signed-off-by: Jun Chen <jun.chen at vatics.com> > --- > > drivers/i2c/designware_i2c.c | 3 +-- > drivers/i2c/designware_i2c.h | 2 -- > 2 files changed, 1 insertion(+), 4 deletions(-) Applied to u-boot-i2c next, thanks! bye, Heiko
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index f4fbf3b..74aef77 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -212,8 +212,7 @@ static int calc_bus_speed(struct dw_i2c *priv, int speed, ulong bus_clk, if (priv) scl_sda_cfg = priv->scl_sda_cfg; /* Allow high speed if there is no config, or the config allows it */ - if (speed >= I2C_SPEED_HIGH_RATE && - (!scl_sda_cfg || scl_sda_cfg->has_high_speed)) + if (speed >= I2C_SPEED_HIGH_RATE) i2c_spd = IC_SPEED_MODE_HIGH; else if (speed >= I2C_SPEED_FAST_PLUS_RATE) i2c_spd = IC_SPEED_MODE_FAST_PLUS; diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h index 23f311b..5a04ce5 100644 --- a/drivers/i2c/designware_i2c.h +++ b/drivers/i2c/designware_i2c.h @@ -144,7 +144,6 @@ struct i2c_regs { /** * struct dw_scl_sda_cfg - I2C timing configuration * - * @has_high_speed: Support high speed (3.4Mbps) * @ss_hcnt: Standard speed high time in ns * @fs_hcnt: Fast speed high time in ns * @ss_lcnt: Standard speed low time in ns @@ -152,7 +151,6 @@ struct i2c_regs { * @sda_hold: SDA hold time */ struct dw_scl_sda_cfg { - bool has_high_speed; u32 ss_hcnt; u32 fs_hcnt; u32 ss_lcnt;