| Message ID | 20200224151530.31713-24-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,01/40] i2c: qup: Move bus frequency definitions to i2c.h | expand |
On Mon, Feb 24, 2020 at 05:15:14PM +0200, Andy Shevchenko wrote: > Since we have generic definitions for bus frequencies, let's use them. > > Cc: "Andreas Färber" <afaerber@suse.de> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani > --- > drivers/i2c/busses/i2c-owl.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c > index b6b5a495118b..f9baeeb1a711 100644 > --- a/drivers/i2c/busses/i2c-owl.c > +++ b/drivers/i2c/busses/i2c-owl.c > @@ -87,9 +87,6 @@ > > #define OWL_I2C_MAX_RETRIES 50 > > -#define OWL_I2C_DEF_SPEED_HZ 100000 > -#define OWL_I2C_MAX_SPEED_HZ 400000 > - > struct owl_i2c_dev { > struct i2c_adapter adap; > struct i2c_msg *msg; > @@ -419,11 +416,11 @@ static int owl_i2c_probe(struct platform_device *pdev) > > if (of_property_read_u32(dev->of_node, "clock-frequency", > &i2c_dev->bus_freq)) > - i2c_dev->bus_freq = OWL_I2C_DEF_SPEED_HZ; > + i2c_dev->bus_freq = I2C_STANDARD_MODE_FREQ; > > /* We support only frequencies of 100k and 400k for now */ > - if (i2c_dev->bus_freq != OWL_I2C_DEF_SPEED_HZ && > - i2c_dev->bus_freq != OWL_I2C_MAX_SPEED_HZ) { > + if (i2c_dev->bus_freq != I2C_STANDARD_MODE_FREQ && > + i2c_dev->bus_freq != I2C_FAST_MODE_FREQ) { > dev_err(dev, "invalid clock-frequency %d\n", i2c_dev->bus_freq); > return -EINVAL; > } > -- > 2.25.0 >
diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c index b6b5a495118b..f9baeeb1a711 100644 --- a/drivers/i2c/busses/i2c-owl.c +++ b/drivers/i2c/busses/i2c-owl.c @@ -87,9 +87,6 @@ #define OWL_I2C_MAX_RETRIES 50 -#define OWL_I2C_DEF_SPEED_HZ 100000 -#define OWL_I2C_MAX_SPEED_HZ 400000 - struct owl_i2c_dev { struct i2c_adapter adap; struct i2c_msg *msg; @@ -419,11 +416,11 @@ static int owl_i2c_probe(struct platform_device *pdev) if (of_property_read_u32(dev->of_node, "clock-frequency", &i2c_dev->bus_freq)) - i2c_dev->bus_freq = OWL_I2C_DEF_SPEED_HZ; + i2c_dev->bus_freq = I2C_STANDARD_MODE_FREQ; /* We support only frequencies of 100k and 400k for now */ - if (i2c_dev->bus_freq != OWL_I2C_DEF_SPEED_HZ && - i2c_dev->bus_freq != OWL_I2C_MAX_SPEED_HZ) { + if (i2c_dev->bus_freq != I2C_STANDARD_MODE_FREQ && + i2c_dev->bus_freq != I2C_FAST_MODE_FREQ) { dev_err(dev, "invalid clock-frequency %d\n", i2c_dev->bus_freq); return -EINVAL; }
Since we have generic definitions for bus frequencies, let's use them. Cc: "Andreas Färber" <afaerber@suse.de> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/i2c/busses/i2c-owl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)