From: Mark Yao <mark.yao@rock-chips.com>
Date: Fri, 10 Mar 2017 03:26:30 +0000 (+0800)
Subject: iommu/rockchip: don't do power domain enable on probe
X-Git-Tag: firefly_0821_release~371
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=0814e5b4a4fb22db2061886bb5271d5561d9889a

iommu/rockchip: don't do power domain enable on probe

Change-Id: I1484cbe6f7aa4fe358a3223de62a19aabee29d5c
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index c4c2c54a6127..60c96b570257 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -267,12 +267,14 @@ static void rk_iommu_power_on(struct rk_iommu *iommu)
 		clk_enable(iommu->hclk);
 	}
 
+	pm_runtime_enable(iommu->dev);
 	pm_runtime_get_sync(iommu->dev);
 }
 
 static void rk_iommu_power_off(struct rk_iommu *iommu)
 {
 	pm_runtime_put_sync(iommu->dev);
+	pm_runtime_disable(iommu->dev);
 
 	if (iommu->aclk && iommu->hclk) {
 		clk_disable(iommu->aclk);
@@ -1209,15 +1211,11 @@ static int rk_iommu_probe(struct platform_device *pdev)
 		clk_prepare(iommu->hclk);
 	}
 
-	pm_runtime_enable(dev);
-
 	return 0;
 }
 
 static int rk_iommu_remove(struct platform_device *pdev)
 {
-	pm_runtime_disable(&pdev->dev);
-
 	return 0;
 }