| Message ID | 1403153691-15606-1-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Jun 18, 2014 at 9:54 PM, Doug Anderson <dianders@chromium.org> wrote: > From: Vincent Palatin <vpalatin@chromium.org> > > When the wake-up is triggered by the PMIC RTC, the RTC driver is trying > to read the PMIC interrupt status over I2C and fails because the I2C > controller is not resumed yet. > Let's resume the I2C controller earlier in the _noirq phase > (as other hardwares are doing), so we can properly get the wake-up > condition. > > Signed-off-by: Vincent Palatin <vpalatin@chromium.org> > Signed-off-by: Doug Anderson <dianders@chromium.org> > --- > drivers/i2c/busses/i2c-s3c2410.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c > index e828a1d..b904132 100644 > --- a/drivers/i2c/busses/i2c-s3c2410.c > +++ b/drivers/i2c/busses/i2c-s3c2410.c > @@ -1267,7 +1267,7 @@ static int s3c24xx_i2c_suspend_noirq(struct device *dev) > return 0; > } > > -static int s3c24xx_i2c_resume(struct device *dev) > +static int s3c24xx_i2c_resume_noirq(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev); > @@ -1285,7 +1285,7 @@ static int s3c24xx_i2c_resume(struct device *dev) > static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { > #ifdef CONFIG_PM_SLEEP > .suspend_noirq = s3c24xx_i2c_suspend_noirq, > - .resume = s3c24xx_i2c_resume, > + .resume_noirq = s3c24xx_i2c_resume_noirq, I looked at applying this to another i2c controller and stumbled upon feedback from Wolfram suggesting that I should add "poweroff, thaw, freeze, restore". I'm happy to squash that into this patch or send a separate patch if people would like it. Just let me know. -Doug
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index e828a1d..b904132 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1267,7 +1267,7 @@ static int s3c24xx_i2c_suspend_noirq(struct device *dev) return 0; } -static int s3c24xx_i2c_resume(struct device *dev) +static int s3c24xx_i2c_resume_noirq(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev); @@ -1285,7 +1285,7 @@ static int s3c24xx_i2c_resume(struct device *dev) static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { #ifdef CONFIG_PM_SLEEP .suspend_noirq = s3c24xx_i2c_suspend_noirq, - .resume = s3c24xx_i2c_resume, + .resume_noirq = s3c24xx_i2c_resume_noirq, #endif };