projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c943740
)
w1 i.MX: prepare/unprepare clock
author
Sascha Hauer
<s.hauer@pengutronix.de>
Wed, 7 Mar 2012 19:59:36 +0000
(20:59 +0100)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Wed, 25 Apr 2012 15:03:41 +0000
(17:03 +0200)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/w1/masters/mxc_w1.c
patch
|
blob
|
history
diff --git
a/drivers/w1/masters/mxc_w1.c
b/drivers/w1/masters/mxc_w1.c
index
a3b6a74
..
1cc61a7
100644
(file)
--- a/
drivers/w1/masters/mxc_w1.c
+++ b/
drivers/w1/masters/mxc_w1.c
@@
-138,7
+138,7
@@
static int __devinit mxc_w1_probe(struct platform_device *pdev)
goto failed_ioremap;
}
- clk_enable(mdev->clk);
+ clk_
prepare_
enable(mdev->clk);
__raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
mdev->bus_master.data = mdev;
@@
-178,7
+178,7
@@
static int __devexit mxc_w1_remove(struct platform_device *pdev)
iounmap(mdev->regs);
release_mem_region(res->start, resource_size(res));
- clk_disable(mdev->clk);
+ clk_disable
_unprepare
(mdev->clk);
clk_put(mdev->clk);
platform_set_drvdata(pdev, NULL);