Messages in this thread Patch in this message | | | Date | Thu, 26 Jun 2008 16:52:09 +0400 | From | Dmitry Baryshkov <> | Subject | [PATCH 3/3] Clocklib: refactor SA-1100 to use clocklib |
| |
Make SA-1100 use clocklib for clocks support.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> --- arch/arm/Kconfig | 1 + arch/arm/mach-sa1100/clock.c | 114 ++++++------------------------------------ 2 files changed, 17 insertions(+), 98 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e7d0343..fffd99a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -421,6 +421,7 @@ config ARCH_SA1100 select GENERIC_CLOCKEVENTS select TICK_ONESHOT select HAVE_GPIO_LIB + select HAVE_CLOCKLIB 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..61760b7 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c @@ -3,88 +3,12 @@ */ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/list.h> -#include <linux/errno.h> -#include <linux/err.h> -#include <linux/string.h> #include <linux/clk.h> -#include <linux/spinlock.h> -#include <linux/mutex.h> +#include <linux/clocklib.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_enable(struct clk *clk) { /* * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111: @@ -93,38 +17,32 @@ static void clk_gpio27_enable(void) GAFR |= GPIO_32_768kHz; GPDR |= GPIO_32_768kHz; TUCR = TUCR_3_6864MHz; + + return 0; } -static void clk_gpio27_disable(void) +static void clk_gpio27_disable(struct clk *clk) { TUCR = 0; GPDR &= ~GPIO_32_768kHz; GAFR &= ~GPIO_32_768kHz; } -static struct clk clk_gpio27 = { - .name = "GPIO27_CLK", - .rate = 3686400, +static unsigned long clk_gpio27_get_rate(struct clk *clk) +{ + return 3686400; +} + +static struct clk_ops clk_gpio27_ops = { .enable = clk_gpio27_enable, .disable = clk_gpio27_disable, + .get_rate = clk_gpio27_get_rate, }; -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); - -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 clk_gpio27 = { + .name = "GPIO27_CLK", + .ops = &clk_gpio27_ops, +}; static int __init clk_init(void) { -- 1.5.5.4
-- With best wishes Dmitry
| |