i2c: cadence: Fix power management order of operations

E.g. pm_runtime_set_active must be called while the power
management system is disabled. Fixes extra hanging clk_enable.

Signed-off-by: Topi Kuutela <topi.kuutela@gmail.com>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index bae64c6d3e4875c24495dd63f9ada7e4decd39d3..276cfa8bd9975e97101577a518c825e0db37dbc6 100644 (file)
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -937,10 +937,10 @@ static int cdns_i2c_probe(struct platform_device *pdev)
        if (ret)
                dev_err(&pdev->dev, "Unable to enable clock.\n");
 
-       pm_runtime_enable(id->dev);
        pm_runtime_set_autosuspend_delay(id->dev, CNDS_I2C_PM_TIMEOUT);
        pm_runtime_use_autosuspend(id->dev);
        pm_runtime_set_active(id->dev);
+       pm_runtime_enable(id->dev);
 
        id->clk_rate_change_nb.notifier_call = cdns_i2c_clk_notifier_cb;
        if (clk_notifier_register(id->clk, &id->clk_rate_change_nb))
@@ -989,8 +989,8 @@ static int cdns_i2c_probe(struct platform_device *pdev)
 
 err_clk_dis:
        clk_disable_unprepare(id->clk);
-       pm_runtime_set_suspended(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
+       pm_runtime_set_suspended(&pdev->dev);
        return ret;
 }
 
@@ -1006,10 +1006,13 @@ static int cdns_i2c_remove(struct platform_device *pdev)
 {
        struct cdns_i2c *id = platform_get_drvdata(pdev);
 
+       pm_runtime_disable(&pdev->dev);
+       pm_runtime_set_suspended(&pdev->dev);
+       pm_runtime_dont_use_autosuspend(&pdev->dev);
+
        i2c_del_adapter(&id->adap);
        clk_notifier_unregister(id->clk, &id->clk_rate_change_nb);
        clk_disable_unprepare(id->clk);
-       pm_runtime_disable(&pdev->dev);
 
        return 0;
 }