aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/clock.c
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2010-05-18 22:23:59 -0400
committerPaul Walmsley <paul@pwsan.com>2010-05-20 14:31:12 -0400
commit89e5ab26d89fda15924658866b57c967ba7507cc (patch)
tree9f7bb042f59e49c55158bb695d89e9638dc6e412 /arch/arm/plat-omap/clock.c
parentfe894d56322b10910631800b86f25f13bc64c639 (diff)
OMAP4 clock: Support clk_set_parent
Remove the hack put in place while clock framework was still not in place for OMAP4. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/plat-omap/clock.c')
-rw-r--r--arch/arm/plat-omap/clock.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index c9cd98a97abb..7190cbd92620 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -138,11 +138,6 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
138 unsigned long flags; 138 unsigned long flags;
139 int ret = -EINVAL; 139 int ret = -EINVAL;
140 140
141 if (cpu_is_omap44xx()) {
142 WARN(1, "clock: %s: not supported yet on OMAP4\n", __func__);
143 return 0;
144 }
145
146 if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent)) 141 if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent))
147 return ret; 142 return ret;
148 143