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>

diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index f4fbf3ba9f5017b67d34800ef92fa75827919535..74aef7744caa45397b41ab6da139f8802a4808b8 100644 (file)
--- 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 23f311b61ca2c044b9b1a8bb6a809876a1971807..5a04ce50e290a7d634ef273b9792e3c2f6ab28c5 100644 (file)
--- 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;