clk: add versatile ICST307 driver

The ICST307 VCO clock has a shared driver in the ARM
architecture. This patch provides a wrapper into the common
clock framework so we can use the implementation in the
ARM architecture without duplicating the code until all
ARM platforms using this VCO are moved over. At that point
we can merge the driver from the ARM platform into the
generic file altogether.

Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[mturquette@linaro.org: removed versatile Kconfig]
Signed-off-by: Mike Turquette <mturquette@linaro.org>

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 35d9fb4..a4d67d7 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_COMMON_CLK)        += clk.o clk-fixed-rate.o clk-gate.o \
 obj-$(CONFIG_ARCH_MXS)         += mxs/
 obj-$(CONFIG_PLAT_SPEAR)       += spear/
 obj-$(CONFIG_ARCH_U300)                += clk-u300.o
+obj-$(CONFIG_ARCH_INTEGRATOR)  += versatile/
 
 # Chip specific
 obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o

diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile
new file mode 100644 (file)
index 0000000..a83539b
--- /dev/null
+++ b/drivers/clk/versatile/Makefile
@@ -0,0 +1,2 @@
+# Makefile for Versatile-specific clocks
+obj-$(CONFIG_ICST)             += clk-icst.o

diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
new file mode 100644 (file)
index 0000000..f555b50
--- /dev/null
+++ b/drivers/clk/versatile/clk-icst.c
@@ -0,0 +1,100 @@
+/*
+ * Driver for the ICST307 VCO clock found in the ARM Reference designs.
+ * We wrap the custom interface from <asm/hardware/icst.h> into the generic
+ * clock framework.
+ *
+ * TODO: when all ARM reference designs are migrated to generic clocks, the
+ * ICST clock code from the ARM tree should probably be merged into this
+ * file.
+ */
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <linux/err.h>
+#include <linux/clk-provider.h>
+
+#include "clk-icst.h"
+
+/**
+ * struct clk_icst - ICST VCO clock wrapper
+ * @hw: corresponding clock hardware entry
+ * @params: parameters for this ICST instance
+ * @rate: current rate
+ * @setvco: function to commit ICST settings to hardware
+ */
+struct clk_icst {
+       struct clk_hw hw;
+       const struct icst_params *params;
+       unsigned long rate;
+       struct icst_vco (*getvco)(void);
+       void (*setvco)(struct icst_vco);
+};
+
+#define to_icst(_hw) container_of(_hw, struct clk_icst, hw)
+
+static unsigned long icst_recalc_rate(struct clk_hw *hw,
+                                     unsigned long parent_rate)
+{
+       struct clk_icst *icst = to_icst(hw);
+       struct icst_vco vco;
+
+       vco = icst->getvco();
+       icst->rate = icst_hz(icst->params, vco);
+       return icst->rate;
+}
+
+static long icst_round_rate(struct clk_hw *hw, unsigned long rate,
+                           unsigned long *prate)
+{
+       struct clk_icst *icst = to_icst(hw);
+       struct icst_vco vco;
+
+       vco = icst_hz_to_vco(icst->params, rate);
+       return icst_hz(icst->params, vco);
+}
+
+static int icst_set_rate(struct clk_hw *hw, unsigned long rate,
+                        unsigned long parent_rate)
+{
+       struct clk_icst *icst = to_icst(hw);
+       struct icst_vco vco;
+
+       vco = icst_hz_to_vco(icst->params, rate);
+       icst->rate = icst_hz(icst->params, vco);
+       icst->setvco(vco);
+       return 0;
+}
+
+static const struct clk_ops icst_ops = {
+       .recalc_rate = icst_recalc_rate,
+       .round_rate = icst_round_rate,
+       .set_rate = icst_set_rate,
+};
+
+struct clk * __init icst_clk_register(struct device *dev,
+                                     const struct clk_icst_desc *desc)
+{
+       struct clk *clk;
+       struct clk_icst *icst;
+       struct clk_init_data init;
+
+       icst = kzalloc(sizeof(struct clk_icst), GFP_KERNEL);
+       if (!icst) {
+               pr_err("could not allocate ICST clock!\n");
+               return ERR_PTR(-ENOMEM);
+       }
+       init.name = "icst";
+       init.ops = &icst_ops;
+       init.flags = CLK_IS_ROOT;
+       init.parent_names = NULL;
+       init.num_parents = 0;
+       icst->hw.init = &init;
+       icst->params = desc->params;
+       icst->getvco = desc->getvco;
+       icst->setvco = desc->setvco;
+
+       clk = clk_register(dev, &icst->hw);
+       if (IS_ERR(clk))
+               kfree(icst);
+
+       return clk;
+}

diff --git a/drivers/clk/versatile/clk-icst.h b/drivers/clk/versatile/clk-icst.h
new file mode 100644 (file)
index 0000000..71b4c56
--- /dev/null
+++ b/drivers/clk/versatile/clk-icst.h
@@ -0,0 +1,10 @@
+#include <asm/hardware/icst.h>
+
+struct clk_icst_desc {
+       const struct icst_params *params;
+       struct icst_vco (*getvco)(void);
+       void (*setvco)(struct icst_vco);
+};
+
+struct clk *icst_clk_register(struct device *dev,
+                             const struct clk_icst_desc *desc);