Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a54c959d authored by Rob Herring's avatar Rob Herring
Browse files

clk: versatile: add versatile OSC support 



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

Renaming the file to clk-versatile.c as versatile is used as the family
name for ARM, Ltd. boards.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarMike Turquette <mturquette@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2e452785

drivers/clk/versatile/Makefile

+1 −2
Original line number Diff line number Diff line 
# 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-versatile.o

obj-$(CONFIG_INTEGRATOR_IMPD1)	+= clk-impd1.o

obj-$(CONFIG_ARCH_REALVIEW)	+= clk-realview.o

obj-$(CONFIG_ARCH_VEXPRESS)	+= clk-vexpress.o

drivers/clk/versatile/clk-integrator.c→drivers/clk/versatile/clk-versatile.c

+35 −3
Original line number Diff line number Diff line 
/*

 * Clock driver for the ARM Integrator/AP and Integrator/CP boards

 * Clock driver for the ARM Integrator/AP, Integrator/CP, Versatile AB and

 * Versatile PB boards.

 * Copyright (C) 2012 Linus Walleij

 *

 * This program is free software; you can redistribute it and/or modify
@@ -17,6 +18,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 +41,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 +85,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);