| Message ID | 20200224151530.31713-33-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,01/40] i2c: qup: Move bus frequency definitions to i2c.h | expand |
Hi Look good to me. Reviewed-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com> Thanks On 2/24/20 4:15 PM, Andy Shevchenko wrote: > Since we have generic definitions for bus frequencies, let's use them. > > Cc: Pierre-Yves MORDRET <pierre-yves.mordret@st.com> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Alexandre Torgue <alexandre.torgue@st.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/i2c/busses/i2c-stm32f7.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c > index 5c3e8ac6ad92..9af5733ed513 100644 > --- a/drivers/i2c/busses/i2c-stm32f7.c > +++ b/drivers/i2c/busses/i2c-stm32f7.c > @@ -334,9 +334,9 @@ struct stm32f7_i2c_dev { > */ > static struct stm32f7_i2c_spec i2c_specs[] = { > [STM32_I2C_SPEED_STANDARD] = { > - .rate = 100000, > - .rate_min = 80000, > - .rate_max = 100000, > + .rate = I2C_STANDARD_MODE_FREQ, > + .rate_min = I2C_STANDARD_MODE_FREQ * 8 / 10, /* 80% */ > + .rate_max = I2C_STANDARD_MODE_FREQ, > .fall_max = 300, > .rise_max = 1000, > .hddat_min = 0, > @@ -346,9 +346,9 @@ static struct stm32f7_i2c_spec i2c_specs[] = { > .h_min = 4000, > }, > [STM32_I2C_SPEED_FAST] = { > - .rate = 400000, > - .rate_min = 320000, > - .rate_max = 400000, > + .rate = I2C_FAST_MODE_FREQ, > + .rate_min = I2C_FAST_MODE_FREQ * 8 / 10, /* 80% */ > + .rate_max = I2C_FAST_MODE_FREQ, > .fall_max = 300, > .rise_max = 300, > .hddat_min = 0, > @@ -358,9 +358,9 @@ static struct stm32f7_i2c_spec i2c_specs[] = { > .h_min = 600, > }, > [STM32_I2C_SPEED_FAST_PLUS] = { > - .rate = 1000000, > - .rate_min = 800000, > - .rate_max = 1000000, > + .rate = I2C_FAST_MODE_PLUS_FREQ, > + .rate_min = I2C_FAST_MODE_PLUS_FREQ * 8 / 10, /* 80% */ > + .rate_max = I2C_FAST_MODE_PLUS_FREQ, > .fall_max = 100, > .rise_max = 120, > .hddat_min = 0, > @@ -1894,14 +1894,14 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) > i2c_dev->speed = STM32_I2C_SPEED_STANDARD; > ret = device_property_read_u32(&pdev->dev, "clock-frequency", > &clk_rate); > - if (!ret && clk_rate >= 1000000) { > + if (!ret && clk_rate >= I2C_FAST_MODE_PLUS_FREQ) { > i2c_dev->speed = STM32_I2C_SPEED_FAST_PLUS; > ret = stm32f7_i2c_setup_fm_plus_bits(pdev, i2c_dev); > if (ret) > goto clk_free; > - } else if (!ret && clk_rate >= 400000) { > + } else if (!ret && clk_rate >= I2C_FAST_MODE_FREQ) { > i2c_dev->speed = STM32_I2C_SPEED_FAST; > - } else if (!ret && clk_rate >= 100000) { > + } else if (!ret && clk_rate >= I2C_STANDARD_MODE_FREQ) { > i2c_dev->speed = STM32_I2C_SPEED_STANDARD; > } > >
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index 5c3e8ac6ad92..9af5733ed513 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -334,9 +334,9 @@ struct stm32f7_i2c_dev { */ static struct stm32f7_i2c_spec i2c_specs[] = { [STM32_I2C_SPEED_STANDARD] = { - .rate = 100000, - .rate_min = 80000, - .rate_max = 100000, + .rate = I2C_STANDARD_MODE_FREQ, + .rate_min = I2C_STANDARD_MODE_FREQ * 8 / 10, /* 80% */ + .rate_max = I2C_STANDARD_MODE_FREQ, .fall_max = 300, .rise_max = 1000, .hddat_min = 0, @@ -346,9 +346,9 @@ static struct stm32f7_i2c_spec i2c_specs[] = { .h_min = 4000, }, [STM32_I2C_SPEED_FAST] = { - .rate = 400000, - .rate_min = 320000, - .rate_max = 400000, + .rate = I2C_FAST_MODE_FREQ, + .rate_min = I2C_FAST_MODE_FREQ * 8 / 10, /* 80% */ + .rate_max = I2C_FAST_MODE_FREQ, .fall_max = 300, .rise_max = 300, .hddat_min = 0, @@ -358,9 +358,9 @@ static struct stm32f7_i2c_spec i2c_specs[] = { .h_min = 600, }, [STM32_I2C_SPEED_FAST_PLUS] = { - .rate = 1000000, - .rate_min = 800000, - .rate_max = 1000000, + .rate = I2C_FAST_MODE_PLUS_FREQ, + .rate_min = I2C_FAST_MODE_PLUS_FREQ * 8 / 10, /* 80% */ + .rate_max = I2C_FAST_MODE_PLUS_FREQ, .fall_max = 100, .rise_max = 120, .hddat_min = 0, @@ -1894,14 +1894,14 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) i2c_dev->speed = STM32_I2C_SPEED_STANDARD; ret = device_property_read_u32(&pdev->dev, "clock-frequency", &clk_rate); - if (!ret && clk_rate >= 1000000) { + if (!ret && clk_rate >= I2C_FAST_MODE_PLUS_FREQ) { i2c_dev->speed = STM32_I2C_SPEED_FAST_PLUS; ret = stm32f7_i2c_setup_fm_plus_bits(pdev, i2c_dev); if (ret) goto clk_free; - } else if (!ret && clk_rate >= 400000) { + } else if (!ret && clk_rate >= I2C_FAST_MODE_FREQ) { i2c_dev->speed = STM32_I2C_SPEED_FAST; - } else if (!ret && clk_rate >= 100000) { + } else if (!ret && clk_rate >= I2C_STANDARD_MODE_FREQ) { i2c_dev->speed = STM32_I2C_SPEED_STANDARD; }
Since we have generic definitions for bus frequencies, let's use them. Cc: Pierre-Yves MORDRET <pierre-yves.mordret@st.com> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/i2c/busses/i2c-stm32f7.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)