diff options
| author | Abhilash Kesavan <a.kesavan@samsung.com> | 2012-11-19 15:47:17 +0530 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-11-19 11:54:55 +0100 |
| commit | 658122fe5e3a72940631ceda3efcb841054d91dc (patch) | |
| tree | 629d39121fa1babca9e4fbe585734c8d096cc7b6 /drivers/i2c | |
| parent | 3b2f3ceb3c7f4a8c2d11aa7652842e5ce1b0dcc3 (diff) | |
| download | linux-658122fe5e3a72940631ceda3efcb841054d91dc.tar.bz2 | |
i2c: s3c2410: Add fix for i2c suspend/resume
The I2C driver makes a gpio_request during initialization. This request
happens again on resume and fails due to the earlier successful request.
Re-factor the code to only initialize the gpios during probe.
Errors on resume without this:
[ 16.020000] s3c-i2c s3c2440-i2c.0: gpio [42] request failed
[ 16.020000] s3c-i2c s3c2440-i2c.1: gpio [44] request failed
[ 16.020000] s3c-i2c s3c2440-i2c.2: gpio [6] request failed
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 16592e5ab08a..d784c76ae3e8 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -908,13 +908,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c) pdata = i2c->pdata; - /* inititalise the gpio */ - - if (pdata->cfg_gpio) - pdata->cfg_gpio(to_platform_device(i2c->dev)); - else if (IS_ERR(i2c->pctrl) && s3c24xx_i2c_parse_dt_gpio(i2c)) - return -EINVAL; - /* write slave address */ writeb(pdata->slave_addr, i2c->regs + S3C2410_IICADD); @@ -1055,6 +1048,15 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) i2c->pctrl = devm_pinctrl_get_select_default(i2c->dev); + /* inititalise the i2c gpio lines */ + + if (i2c->pdata->cfg_gpio) { + i2c->pdata->cfg_gpio(to_platform_device(i2c->dev)); + } else if (IS_ERR(i2c->pctrl) && s3c24xx_i2c_parse_dt_gpio(i2c)) { + ret = -EINVAL; + goto err_clk; + } + /* initialise the i2c controller */ ret = s3c24xx_i2c_init(i2c); |