summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/clock.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-06-30 19:47:59 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 20:54:14 +0100
commitbdb08cb2d3491d441dd403dfb88d90ba90fb7232 (patch)
tree390117716c0f4f30a50636a5a0ef1e828e48d1fa /arch/arm/mach-pxa/clock.c
parent5e329d1c7f5fe6adfee99c783fa98bda7dae8ac5 (diff)
[ARM] pxa: allow clk aliases
We need to support more than one name+device for a struct clk for a small number of peripherals. We do this by re-using struct clk alias to another struct clk - IOW, if we find that the entry we're using is an alias, we return the aliased entry not the one we found. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/clock.c')
-rw-r--r--arch/arm/mach-pxa/clock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c
index e97dc59813c8..68afc396b4a1 100644
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@ -47,6 +47,9 @@ struct clk *clk_get(struct device *dev, const char *id)
clk = p;
mutex_unlock(&clocks_mutex);
+ if (!IS_ERR(clk) && clk->ops == NULL)
+ clk = clk->other;
+
return clk;
}
EXPORT_SYMBOL(clk_get);