Commit fd6ddaa0 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang

i2c: drivers: Use generic definitions for bus frequencies (part 2)

Since we have generic definitions for bus frequencies, let's use them.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarKhalil Blaiech <kblaiech@nvidia.com>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 17631e8c
...@@ -82,7 +82,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) ...@@ -82,7 +82,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
* difference is the timing parameter values since the registers are * difference is the timing parameter values since the registers are
* the same. * the same.
*/ */
if (t->bus_freq_hz == 1000000) { if (t->bus_freq_hz == I2C_MAX_FAST_MODE_PLUS_FREQ) {
/* /*
* Check are Fast Mode Plus parameters available. Calculate * Check are Fast Mode Plus parameters available. Calculate
* SCL timing parameters for Fast Mode Plus if not set. * SCL timing parameters for Fast Mode Plus if not set.
......
...@@ -172,12 +172,6 @@ ...@@ -172,12 +172,6 @@
#define MLXBF_I2C_SMBUS_THIGH_MAX_TBUF 0x14 #define MLXBF_I2C_SMBUS_THIGH_MAX_TBUF 0x14
#define MLXBF_I2C_SMBUS_SCL_LOW_TIMEOUT 0x18 #define MLXBF_I2C_SMBUS_SCL_LOW_TIMEOUT 0x18
enum {
MLXBF_I2C_TIMING_100KHZ = 100000,
MLXBF_I2C_TIMING_400KHZ = 400000,
MLXBF_I2C_TIMING_1000KHZ = 1000000,
};
/* /*
* Defines SMBus operating frequency and core clock frequency. * Defines SMBus operating frequency and core clock frequency.
* According to ADB files, default values are compliant to 100KHz SMBus * According to ADB files, default values are compliant to 100KHz SMBus
...@@ -1202,7 +1196,7 @@ static int mlxbf_i2c_init_timings(struct platform_device *pdev, ...@@ -1202,7 +1196,7 @@ static int mlxbf_i2c_init_timings(struct platform_device *pdev,
ret = device_property_read_u32(dev, "clock-frequency", &config_khz); ret = device_property_read_u32(dev, "clock-frequency", &config_khz);
if (ret < 0) if (ret < 0)
config_khz = MLXBF_I2C_TIMING_100KHZ; config_khz = I2C_MAX_STANDARD_MODE_FREQ;
switch (config_khz) { switch (config_khz) {
default: default:
...@@ -1210,15 +1204,15 @@ static int mlxbf_i2c_init_timings(struct platform_device *pdev, ...@@ -1210,15 +1204,15 @@ static int mlxbf_i2c_init_timings(struct platform_device *pdev,
pr_warn("Illegal value %d: defaulting to 100 KHz\n", pr_warn("Illegal value %d: defaulting to 100 KHz\n",
config_khz); config_khz);
fallthrough; fallthrough;
case MLXBF_I2C_TIMING_100KHZ: case I2C_MAX_STANDARD_MODE_FREQ:
config_idx = MLXBF_I2C_TIMING_CONFIG_100KHZ; config_idx = MLXBF_I2C_TIMING_CONFIG_100KHZ;
break; break;
case MLXBF_I2C_TIMING_400KHZ: case I2C_MAX_FAST_MODE_FREQ:
config_idx = MLXBF_I2C_TIMING_CONFIG_400KHZ; config_idx = MLXBF_I2C_TIMING_CONFIG_400KHZ;
break; break;
case MLXBF_I2C_TIMING_1000KHZ: case I2C_MAX_FAST_MODE_PLUS_FREQ:
config_idx = MLXBF_I2C_TIMING_CONFIG_1000KHZ; config_idx = MLXBF_I2C_TIMING_CONFIG_1000KHZ;
break; break;
} }
......
...@@ -569,9 +569,9 @@ static int cci_probe(struct platform_device *pdev) ...@@ -569,9 +569,9 @@ static int cci_probe(struct platform_device *pdev)
cci->master[idx].mode = I2C_MODE_STANDARD; cci->master[idx].mode = I2C_MODE_STANDARD;
ret = of_property_read_u32(child, "clock-frequency", &val); ret = of_property_read_u32(child, "clock-frequency", &val);
if (!ret) { if (!ret) {
if (val == 400000) if (val == I2C_MAX_FAST_MODE_FREQ)
cci->master[idx].mode = I2C_MODE_FAST; cci->master[idx].mode = I2C_MODE_FAST;
else if (val == 1000000) else if (val == I2C_MAX_FAST_MODE_PLUS_FREQ)
cci->master[idx].mode = I2C_MODE_FAST_PLUS; cci->master[idx].mode = I2C_MODE_FAST_PLUS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment