summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun Chen <jun.chen@vatics.com>2020-03-02 16:58:56 +0800
committerHeiko Schocher <hs@denx.de>2020-03-16 08:04:17 +0100
commitbe26342314a6aacc1bb1e53ad00dfb4b836f0134 (patch)
tree630401ebf5efe91915bcb4e8dd0c8b505031d653
parent565e328b959b58c181fdec33b2e161ada90dd521 (diff)
i2c: designware_i2c: remove 'has_high_speed'
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>
-rw-r--r--drivers/i2c/designware_i2c.c3
-rw-r--r--drivers/i2c/designware_i2c.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index f4fbf3ba9f..74aef7744c 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 23f311b61c..5a04ce50e2 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;