summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@blackshift.org>2012-06-22 08:54:01 +0200
committerOlof Johansson <olof@lixom.net>2012-06-23 16:19:02 -0700
commit5fb2ce119c113e5c987fa81ed89e73b2653e28e4 (patch)
treed11f2747ca98de28d53b6c62c5644fe36a4b475c
parentb5e12229a4850ae9b19ee5252508749da8844b3c (diff)
downloadop-kernel-dev-5fb2ce119c113e5c987fa81ed89e73b2653e28e4.zip
op-kernel-dev-5fb2ce119c113e5c987fa81ed89e73b2653e28e4.tar.gz
ARM: Kirkwood: clk_register_gate_fn: add fn assignment
In commit: 98d9986 ARM: Kirkwood: Replace clock gating the kirkwood clock gating has been reworked. A custom variant of clock gating, that calls a custom function before gating the clock off, has been introduced. However in clk_register_gate_fn() this custom function "fn" is never assigned. This patch adds the missing fn assignment. Cc: stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@blackshift.org> Tested-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-kirkwood/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index e1d2c6d..f261cd2 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -159,6 +159,7 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
gate_fn->gate.flags = clk_gate_flags;
gate_fn->gate.lock = lock;
gate_fn->gate.hw.init = &init;
+ gate_fn->fn = fn;
/* ops is the gate ops, but with our disable function */
if (clk_gate_fn_ops.disable != clk_gate_fn_disable) {
OpenPOWER on IntegriCloud