[10/10] clk: versatile: add versatile OSC support

Commit Message

Rob Herring May 20, 2014, 9:09 p.m. UTC

From: Rob Herring <[e-mail]>

Versatile platforms share the same OSC programming model as Integrator
platforms. Add the necessary parameters and init functions for Versatile.

Signed-off-by: Rob Herring <[e-mail]>
Cc: Mike Turquette <[e-mail]>
---
 drivers/clk/versatile/Makefile         |  3 +--
 drivers/clk/versatile/clk-integrator.c | 35 ++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

Comments

Linus Walleij May 23, 2014, 1:31 p.m. UTC | #1

On Tue, May 20, 2014 at 11:09 PM, Rob Herring <[e-mail]> wrote:

> From: Rob Herring <[e-mail]>
>
> Versatile platforms share the same OSC programming model as Integrator
> platforms. Add the necessary parameters and init functions for Versatile.
>
> Signed-off-by: Rob Herring <[e-mail]>
> Cc: Mike Turquette <[e-mail]>
> ---
>  drivers/clk/versatile/Makefile         |  3 +--
>  drivers/clk/versatile/clk-integrator.c | 35 ++++++++++++++++++++++++++++++++--

So then this is a good opportunity to rename that file from clk-integrator.c
to something else, right? Usually we use "versatile" to refer to the
whole family of boards but other names are possible I guess.

Apart from that it looks good :-)

Yours,
Linus Walleij

Mike Turquette May 23, 2014, 7:13 p.m. UTC | #2

Quoting Linus Walleij (2014-05-23 06:31:26)
> On Tue, May 20, 2014 at 11:09 PM, Rob Herring <[e-mail]> wrote:
> 
> > From: Rob Herring <[e-mail]>
> >
> > Versatile platforms share the same OSC programming model as Integrator
> > platforms. Add the necessary parameters and init functions for Versatile.
> >
> > Signed-off-by: Rob Herring <[e-mail]>
> > Cc: Mike Turquette <[e-mail]>
> > ---
> >  drivers/clk/versatile/Makefile         |  3 +--
> >  drivers/clk/versatile/clk-integrator.c | 35 ++++++++++++++++++++++++++++++++--
> 
> So then this is a good opportunity to rename that file from clk-integrator.c
> to something else, right? Usually we use "versatile" to refer to the
> whole family of boards but other names are possible I guess.
> 
> Apart from that it looks good :-)

Looks good to me too. Rob will you incorporate the file name change?

Regards,
Mike

> 
> Yours,
> Linus Walleij

Patch

diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile
index c16ca78..fb7f916 100644
--- a/drivers/clk/versatile/Makefile
+++ b/drivers/clk/versatile/Makefile
@@ -1,6 +1,5 @@ 
 # Makefile for Versatile-specific clocks
-obj-$(CONFIG_ICST)		+= clk-icst.o
-obj-$(CONFIG_ARCH_INTEGRATOR)	+= clk-integrator.o
+obj-$(CONFIG_ICST)		+= clk-icst.o clk-integrator.o
 obj-$(CONFIG_INTEGRATOR_IMPD1)	+= clk-impd1.o
 obj-$(CONFIG_ARCH_REALVIEW)	+= clk-realview.o
 obj-$(CONFIG_ARCH_VEXPRESS)	+= clk-vexpress.o clk-sp810.o
diff --git a/drivers/clk/versatile/clk-integrator.c b/drivers/clk/versatile/clk-integrator.c
index 734c4b8..fe52a79 100644
--- a/drivers/clk/versatile/clk-integrator.c
+++ b/drivers/clk/versatile/clk-integrator.c
@@ -17,6 +17,9 @@ 
 
 #define INTEGRATOR_HDR_LOCK_OFFSET	0x14
 
+#define VERSATILE_SYS_OSCCLCD_OFFSET	0x1c
+#define VERSATILE_SYS_LOCK_OFFSET	0x20
+
 /* Base offset for the core module */
 static void __iomem *cm_base;
 
@@ -37,11 +40,27 @@  static const struct clk_icst_desc __initdata cm_auxosc_desc = {
 	.lock_offset = INTEGRATOR_HDR_LOCK_OFFSET,
 };
 
-static void __init of_integrator_cm_osc_setup(struct device_node *np)
+static const struct icst_params versatile_auxosc_params = {
+	.vco_max	= ICST307_VCO_MAX,
+	.vco_min	= ICST307_VCO_MIN,
+	.vd_min		= 4 + 8,
+	.vd_max		= 511 + 8,
+	.rd_min		= 1 + 2,
+	.rd_max		= 127 + 2,
+	.s2div		= icst307_s2div,
+	.idx2s		= icst307_idx2s,
+};
+
+static const struct clk_icst_desc versatile_auxosc_desc __initconst = {
+	.params = &versatile_auxosc_params,
+	.vco_offset = VERSATILE_SYS_OSCCLCD_OFFSET,
+	.lock_offset = VERSATILE_SYS_LOCK_OFFSET,
+};
+static void __init cm_osc_setup(struct device_node *np,
+				const struct clk_icst_desc *desc)
 {
 	struct clk *clk = ERR_PTR(-EINVAL);
 	const char *clk_name = np->name;
-	const struct clk_icst_desc *desc = &cm_auxosc_desc;
 	const char *parent_name;
 
 	if (!cm_base) {
@@ -65,5 +84,17 @@  static void __init of_integrator_cm_osc_setup(struct device_node *np)
 	if (!IS_ERR(clk))
 		of_clk_add_provider(np, of_clk_src_simple_get, clk);
 }
+
+static void __init of_integrator_cm_osc_setup(struct device_node *np)
+{
+	cm_osc_setup(np, &cm_auxosc_desc);
+}
 CLK_OF_DECLARE(integrator_cm_auxosc_clk,
 	"arm,integrator-cm-auxosc", of_integrator_cm_osc_setup);
+
+static void __init of_versatile_cm_osc_setup(struct device_node *np)
+{
+	cm_osc_setup(np, &versatile_auxosc_desc);
+}
+CLK_OF_DECLARE(versatile_cm_auxosc_clk,
+	       "arm,versatile-cm-auxosc", of_versatile_cm_osc_setup);