Messages in this thread Patch in this message |  | | Date | Thu, 3 Apr 2008 17:23:45 +0400 | From | Dmitry Baryshkov <> | Subject | [PATCH 3/6] Clocklib: support sa1100 sub-arch. |
| |
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> --- arch/arm/Kconfig | 1 + arch/arm/mach-sa1100/clock.c | 131 ++++++++++------------------------------- 2 files changed, 33 insertions(+), 99 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4039a13..6d78a27 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -426,6 +426,7 @@ config ARCH_SA1100 select GENERIC_GPIO select GENERIC_TIME select HAVE_IDE + select HAVE_CLOCK_LIB help Support for StrongARM 11x0 based boards. diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c index fc97fe5..8f9b777 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c @@ -8,127 +8,60 @@ #include <linux/err.h> #include <linux/string.h> #include <linux/clk.h> +#include <linux/clklib.h> #include <linux/spinlock.h> #include <linux/mutex.h> #include <asm/hardware.h> -/* - * Very simple clock implementation - we only have one clock to - * deal with at the moment, so we only match using the "name". - */ -struct clk { - struct list_head node; - unsigned long rate; - const char *name; - unsigned int enabled; - void (*enable)(void); - void (*disable)(void); -}; - -static LIST_HEAD(clocks); -static DEFINE_MUTEX(clocks_mutex); -static DEFINE_SPINLOCK(clocks_lock); - -struct clk *clk_get(struct device *dev, const char *id) -{ - struct clk *p, *clk = ERR_PTR(-ENOENT); - - mutex_lock(&clocks_mutex); - list_for_each_entry(p, &clocks, node) { - if (strcmp(id, p->name) == 0) { - clk = p; - break; - } - } - mutex_unlock(&clocks_mutex); - - return clk; -} -EXPORT_SYMBOL(clk_get); - -void clk_put(struct clk *clk) -{ -} -EXPORT_SYMBOL(clk_put); - -int clk_enable(struct clk *clk) -{ - unsigned long flags; - - spin_lock_irqsave(&clocks_lock, flags); - if (clk->enabled++ == 0) - clk->enable(); - spin_unlock_irqrestore(&clocks_lock, flags); - return 0; -} -EXPORT_SYMBOL(clk_enable); - -void clk_disable(struct clk *clk) -{ - unsigned long flags; - - WARN_ON(clk->enabled == 0); - - spin_lock_irqsave(&clocks_lock, flags); - if (--clk->enabled == 0) - clk->disable(); - spin_unlock_irqrestore(&clocks_lock, flags); -} -EXPORT_SYMBOL(clk_disable); - -unsigned long clk_get_rate(struct clk *clk) -{ - return clk->rate; -} -EXPORT_SYMBOL(clk_get_rate); - - -static void clk_gpio27_enable(void) +static int clk_gpio27_set_enable(struct clk *clk, bool enable) { /* * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111: * (SA-1110 Developer's Manual, section 9.1.2.1) */ - GAFR |= GPIO_32_768kHz; - GPDR |= GPIO_32_768kHz; - TUCR = TUCR_3_6864MHz; + if (enable) { + GAFR |= GPIO_32_768kHz; + GPDR |= GPIO_32_768kHz; + TUCR = TUCR_3_6864MHz; + } else { + TUCR = 0; + GPDR &= ~GPIO_32_768kHz; + GAFR &= ~GPIO_32_768kHz; + } + + return 0; } -static void clk_gpio27_disable(void) +static unsigned long clk_gpio27_get_rate(struct clk *clk) { - TUCR = 0; - GPDR &= ~GPIO_32_768kHz; - GAFR &= ~GPIO_32_768kHz; + return 3686400; } +static struct clk_ops clk_gpio27_ops = { + .get_rate = clk_gpio27_get_rate, + .set_mode = clk_gpio27_set_enable, +}; + static struct clk clk_gpio27 = { .name = "GPIO27_CLK", - .rate = 3686400, - .enable = clk_gpio27_enable, - .disable = clk_gpio27_disable, + .ops = &clk_gpio27_ops, + .owner = THIS_MODULE, }; -int clk_register(struct clk *clk) -{ - mutex_lock(&clocks_mutex); - list_add(&clk->node, &clocks); - mutex_unlock(&clocks_mutex); - return 0; -} -EXPORT_SYMBOL(clk_register); +static struct clk clk_3_6MHz= { + .name = "3_6MHz_CLK", + .parent = &clk_gpio27, + .owner = THIS_MODULE, +}; -void clk_unregister(struct clk *clk) -{ - mutex_lock(&clocks_mutex); - list_del(&clk->node); - mutex_unlock(&clocks_mutex); -} -EXPORT_SYMBOL(clk_unregister); +static struct clk* clks[] = { + &clk_gpio27, + &clk_3_6MHz, +}; static int __init clk_init(void) { - clk_register(&clk_gpio27); - return 0; + return clks_register(clks, ARRAY_SIZE(clks)); } arch_initcall(clk_init); -- 1.5.4.4
-- With best wishes Dmitry
|  |