aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_imx.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-07-07 18:34:05 -0400
committerJeff Garzik <jgarzik@redhat.com>2012-07-25 15:05:43 -0400
commita18dada08e7fe284767e67d6e4ce8f7d40b40b09 (patch)
tree8f1acf14a3b36847a119a0791737de540e7319b9 /drivers/ata/pata_imx.c
parentff0173c1a3ce003e361a8045ded905c285c3f08f (diff)
pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
With the new i.mx clock framework, we need to use clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_imx.c')
-rw-r--r--drivers/ata/pata_imx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index c5af97f5107b..87bb05b3cafc 100644
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
@@ -118,7 +118,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev)
118 return PTR_ERR(priv->clk); 118 return PTR_ERR(priv->clk);
119 } 119 }
120 120
121 clk_enable(priv->clk); 121 clk_prepare_enable(priv->clk);
122 122
123 host = ata_host_alloc(&pdev->dev, 1); 123 host = ata_host_alloc(&pdev->dev, 1);
124 if (!host) 124 if (!host)
@@ -162,7 +162,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev)
162 &pata_imx_sht); 162 &pata_imx_sht);
163 163
164free_priv: 164free_priv:
165 clk_disable(priv->clk); 165 clk_disable_unprepare(priv->clk);
166 clk_put(priv->clk); 166 clk_put(priv->clk);
167 return -ENOMEM; 167 return -ENOMEM;
168} 168}
@@ -176,7 +176,7 @@ static int __devexit pata_imx_remove(struct platform_device *pdev)
176 176
177 __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); 177 __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
178 178
179 clk_disable(priv->clk); 179 clk_disable_unprepare(priv->clk);
180 clk_put(priv->clk); 180 clk_put(priv->clk);
181 181
182 return 0; 182 return 0;
@@ -194,7 +194,7 @@ static int pata_imx_suspend(struct device *dev)
194 __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); 194 __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
195 priv->ata_ctl = 195 priv->ata_ctl =
196 __raw_readl(priv->host_regs + PATA_IMX_ATA_CONTROL); 196 __raw_readl(priv->host_regs + PATA_IMX_ATA_CONTROL);
197 clk_disable(priv->clk); 197 clk_disable_unprepare(priv->clk);
198 } 198 }
199 199
200 return ret; 200 return ret;
@@ -205,7 +205,7 @@ static int pata_imx_resume(struct device *dev)
205 struct ata_host *host = dev_get_drvdata(dev); 205 struct ata_host *host = dev_get_drvdata(dev);
206 struct pata_imx_priv *priv = host->private_data; 206 struct pata_imx_priv *priv = host->private_data;
207 207
208 clk_enable(priv->clk); 208 clk_prepare_enable(priv->clk);
209 209
210 __raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL); 210 __raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL);
211 211