i2c: drivers: Use generic definitions for bus frequencies (part 2)
Subsystems (4)
PATCH 1/1 i2c: drivers: Use generic definitions for bus frequencies (part 2)
Since we have generic definitions for bus frequencies, let's use them.
Cc Wolfram Sang <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/i2c/busses/i2c-mlxbf.c | 14 ++++---------- drivers/i2c/busses/i2c-qcom-cci.c | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-)
drivers/i2c/busses/i2c-mlxbf.c +4 -10
@@ -172,12 +172,6 @@#define MLXBF_I2C_SMBUS_THIGH_MAX_TBUF 0x14#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. * 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, ret =device_property_read_u32 (dev,"clock-frequency" , &config_khz);if (ret <0 ) - config_khz =MLXBF_I2C_TIMING_100KHZ ; + config_khz =I2C_MAX_STANDARD_MODE_FREQ ;switch (config_khz) {default :
@@ -1210,15 +1204,15 @@ static int mlxbf_i2c_init_timings(struct platform_device *pdev,pr_warn ("Illegal value %d: defaulting to 100 KHz\n" , config_khz); fallthrough; -case MLXBF_I2C_TIMING_100KHZ : +case I2C_MAX_STANDARD_MODE_FREQ : config_idx =MLXBF_I2C_TIMING_CONFIG_100KHZ ;break ; -case MLXBF_I2C_TIMING_400KHZ : +case I2C_MAX_FAST_MODE_FREQ : config_idx =MLXBF_I2C_TIMING_CONFIG_400KHZ ;break ; -case MLXBF_I2C_TIMING_1000KHZ : +case I2C_MAX_FAST_MODE_PLUS_FREQ : config_idx =MLXBF_I2C_TIMING_CONFIG_1000KHZ ;break ; }
drivers/i2c/busses/i2c-qcom-cci.c +2 -2
@@ -569,9 +569,9 @@ static int cci_probe(struct platform_device *pdev) cci->master[idx].mode =I2C_MODE_STANDARD ; ret =of_property_read_u32 (child,"clock-frequency" , &val);if (!ret) { -if (val ==400000 ) +if (val ==I2C_MAX_FAST_MODE_FREQ ) 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 ; }
Signature · 1 line
2.30.2
Thanks.
Acked-by Khalil Blaiech <[email protected]>
Quoted 89 lines
-----Original Message-----
From: Andy Shevchenko <[email protected]>
Sent: Monday, March 22, 2021 12:54 PM
To: Wolfram Sang <[email protected]>; Khalil Blaiech <[email protected]>; Loic Poulain <[email protected]>; [email protected]; linux- [email protected]; [email protected]
Cc: Robert Foss <[email protected]>; Andy Shevchenko <[email protected]>; Wolfram Sang <wsa@the- dreams.de>
Subject: [PATCH v1 1/1] i2c: drivers: Use generic definitions for bus frequencies (part 2)Since we have generic definitions for bus frequencies, let's use them.
Cc Wolfram Sang <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/i2c/busses/i2c-mlxbf.c | 14 ++++---------- drivers/i2c/busses/i2c-qcom-cci.c | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-)drivers/i2c/busses/i2c-mlxbf.c +1
-7@@ -172,12 +172,6 @@#define MLXBF_I2C_SMBUS_THIGH_MAX_TBUF 0x14#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. * According to ADB files, default values are compliant to 100KHz SMBus @@ -1202,7 +1196,7 @@ static int mlxbf_i2c_init_timings(structplatform_device *pdev, ret =device_property_read_u32 (dev,"clock-frequency" , &config_khz);if (ret <0 ) - config_khz =MLXBF_I2C_TIMING_100KHZ ; + config_khz =I2C_MAX_STANDARD_MODE_FREQ ;drivers/i2c/busses/i2c-mlxbf.c +3
-3switch (config_khz) {default :@@ -1210,15 +1204,15 @@ static int mlxbf_i2c_init_timings(struct platform_device *pdev,pr_warn ("Illegal value %d: defaulting to 100 KHz\n" , config_khz); fallthrough; -case MLXBF_I2C_TIMING_100KHZ : +case I2C_MAX_STANDARD_MODE_FREQ : config_idx =MLXBF_I2C_TIMING_CONFIG_100KHZ ;break ; -case MLXBF_I2C_TIMING_400KHZ : +case I2C_MAX_FAST_MODE_FREQ : config_idx =MLXBF_I2C_TIMING_CONFIG_400KHZ ;break ; -case MLXBF_I2C_TIMING_1000KHZ : +case I2C_MAX_FAST_MODE_PLUS_FREQ : config_idx =MLXBF_I2C_TIMING_CONFIG_1000KHZ ;break ;drivers/i2c/busses/i2c-mlxbf.c +0
-0}drivers/i2c/busses/i2c-qcom- renamed from drivers/i2c/busses/i2c-qcom-cci.c +0
-0
cci.c
index1c259b5188de..c63d5545fc2a100644drivers/i2c/busses/i2c-qcom-cci.c +2
-3@@ -569,9 +569,9 @@ static int cci_probe(struct platform_device *pdev) cci->master[idx].mode =I2C_MODE_STANDARD ; ret =of_property_read_u32 (child,"clock-frequency" , &val);if (!ret) { -if (val ==400000 ) +if (val ==I2C_MAX_FAST_MODE_FREQ ) 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 ; } --2.30.2