Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d334ab08 authored by Tomasz Figa's avatar Tomasz Figa Committed by Mauro Carvalho Chehab
Browse files

[media] exynos4-is: Handle suspend/resume of fimc-is-i2c correctly 



If the same callbacks are used for runtime and system suspend/resume,
clocks can get disabled twice, which can lead to negative reference
counts and kernel warnings.
This patch splits suspend/resume callbacks into separate runtime and
system-wide functions, so clock gating is done correctly.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b82180db

drivers/media/platform/exynos4-is/fimc-is-i2c.c

+29 −4
Original line number Diff line number Diff line
@@ -83,21 +83,46 @@ static int fimc_is_i2c_remove(struct platform_device *pdev) 
	return 0;

}



static int fimc_is_i2c_suspend(struct device *dev)

#if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)

static int fimc_is_i2c_runtime_suspend(struct device *dev)

{

	struct fimc_is_i2c *isp_i2c = dev_get_drvdata(dev);



	clk_disable_unprepare(isp_i2c->clock);

	return 0;

}



static int fimc_is_i2c_resume(struct device *dev)

static int fimc_is_i2c_runtime_resume(struct device *dev)

{

	struct fimc_is_i2c *isp_i2c = dev_get_drvdata(dev);



	return clk_prepare_enable(isp_i2c->clock);

}

#endif



static UNIVERSAL_DEV_PM_OPS(fimc_is_i2c_pm_ops, fimc_is_i2c_suspend,

		     fimc_is_i2c_resume, NULL);

#ifdef CONFIG_PM_SLEEP

static int fimc_is_i2c_suspend(struct device *dev)

{

	if (pm_runtime_suspended(dev))

		return 0;



	return fimc_is_i2c_runtime_suspend(dev);

}



static int fimc_is_i2c_resume(struct device *dev)

{

	if (pm_runtime_suspended(dev))

		return 0;



	return fimc_is_i2c_runtime_resume(dev);

}

#endif



static struct dev_pm_ops fimc_is_i2c_pm_ops = {

	SET_RUNTIME_PM_OPS(fimc_is_i2c_runtime_suspend,

					fimc_is_i2c_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(fimc_is_i2c_suspend, fimc_is_i2c_resume)

};



static const struct of_device_id fimc_is_i2c_of_match[] = {

	{ .compatible = FIMC_IS_I2C_COMPATIBLE },