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

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>

diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c
index 138fc72561207e51831c8e1c811c210163e8cf3c..dd1cc0b82383b4db3d6d24e85487d9849079a2f6 100644 (file)
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@@ -62,10 +62,10 @@ static unsigned int __dw_i2c_set_bus_speed(struct i2c_regs *i2c_base,
        unsigned int ena;
        int i2c_spd;
 
-       /* Allow max speed if there is no config, or the config allows it */
-       if (speed >= I2C_MAX_SPEED &&
-           (!scl_sda_cfg || scl_sda_cfg->has_max_speed))
-               i2c_spd = IC_SPEED_MODE_MAX;
+       /* Allow high speed if there is no config, or the config allows it */
+       if (speed >= I2C_HIGH_SPEED &&
+           (!scl_sda_cfg || scl_sda_cfg->has_high_speed))
+               i2c_spd = IC_SPEED_MODE_HIGH;
        else if (speed >= I2C_FAST_SPEED)
                i2c_spd = IC_SPEED_MODE_FAST;
        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));
 
        switch (i2c_spd) {
-       case IC_SPEED_MODE_MAX:
+       case IC_SPEED_MODE_HIGH:
                cntl |= IC_CON_SPD_SS;
                if (scl_sda_cfg) {
                        hcnt = scl_sda_cfg->fs_hcnt;

diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index aade5c2da0b9e75a3deb4ac61f76962ae5b19302..d4c1ca0cc338e15af75b8b5fad67e228a4d18292 100644 (file)
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -138,16 +138,16 @@ struct i2c_regs {
 /* Speed Selection */
 #define IC_SPEED_MODE_STANDARD 1
 #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_STANDARD_SPEED     100000
 
 /**
  * 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
  * @fs_hcnt: Fast speed high time in ns
  * @ss_lcnt: Standard speed low time in ns
@@ -155,7 +155,7 @@ struct i2c_regs {
  * @sda_hold: SDA hold time
  */
 struct dw_scl_sda_cfg {
-       bool has_max_speed;
+       bool has_high_speed;
        u32 ss_hcnt;
        u32 fs_hcnt;
        u32 ss_lcnt;