diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:45 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:45 +0100 |
| commit | 06f66d85753a49d4eb14578914ac7ce5e6454734 (patch) | |
| tree | eb748be6f6139366747067ac8d9b8597ebd4399e /drivers/i2c | |
| parent | c65ca498685d09863efde43c73d955b729340fa5 (diff) | |
| parent | ab8c218ec464f49aa1143cb26964d4774c5facb7 (diff) | |
| download | barebox-06f66d85753a49d4eb14578914ac7ce5e6454734.tar.gz barebox-06f66d85753a49d4eb14578914ac7ce5e6454734.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-stm32.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-stm32.c b/drivers/i2c/busses/i2c-stm32.c index 6af55fb3ff..9f34760e3f 100644 --- a/drivers/i2c/busses/i2c-stm32.c +++ b/drivers/i2c/busses/i2c-stm32.c @@ -785,7 +785,6 @@ static int __init stm32_i2c_probe(struct device_d *dev) struct resource *iores; struct stm32_i2c *stm32_i2c; struct i2c_platform_data *pdata; - struct reset_control *rst; const struct stm32_i2c_setup *setup; struct i2c_timings *timings; int ret; @@ -799,13 +798,9 @@ static int __init stm32_i2c_probe(struct device_d *dev) return PTR_ERR(stm32_i2c->clk); clk_enable(stm32_i2c->clk); - rst = reset_control_get(dev, NULL); - if (IS_ERR(rst)) - return PTR_ERR(rst); - - reset_control_assert(rst); - udelay(2); - reset_control_deassert(rst); + ret = device_reset_us(dev, 2); + if (ret) + return ret; ret = dev_get_drvdata(dev, (const void **)&setup); if (ret) |