Commit d72fbdf0 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] integrator: convert to clkdev and lookup clocks by device name

People often point to the Integrator/Versatile/Realview
implementations to justify using the consumer name as the sole
selector for clocks.

Eliminate this excuse by changing the Integrator implementation, so
it provides a better example of how it should be done.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cf30fb4a
...@@ -210,6 +210,7 @@ config ARCH_INTEGRATOR ...@@ -210,6 +210,7 @@ config ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family" bool "ARM Ltd. Integrator family"
select ARM_AMBA select ARM_AMBA
select HAVE_CLK select HAVE_CLK
select COMMON_CLKDEV
select ICST525 select ICST525
help help
Support for ARM's Integrator platform. Support for ARM's Integrator platform.
......
...@@ -10,42 +10,12 @@ ...@@ -10,42 +10,12 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/err.h>
#include <linux/string.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/hardware/icst525.h> #include <asm/clkdev.h>
#include <mach/clkdev.h>
#include "clock.h"
static LIST_HEAD(clocks);
static DEFINE_MUTEX(clocks_mutex);
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 && try_module_get(p->owner)) {
clk = p;
break;
}
}
mutex_unlock(&clocks_mutex);
return clk;
}
EXPORT_SYMBOL(clk_get);
void clk_put(struct clk *clk)
{
module_put(clk->owner);
}
EXPORT_SYMBOL(clk_put);
int clk_enable(struct clk *clk) int clk_enable(struct clk *clk)
{ {
...@@ -67,7 +37,6 @@ EXPORT_SYMBOL(clk_get_rate); ...@@ -67,7 +37,6 @@ EXPORT_SYMBOL(clk_get_rate);
long clk_round_rate(struct clk *clk, unsigned long rate) long clk_round_rate(struct clk *clk, unsigned long rate)
{ {
struct icst525_vco vco; struct icst525_vco vco;
vco = icst525_khz_to_vco(clk->params, rate / 1000); vco = icst525_khz_to_vco(clk->params, rate / 1000);
return icst525_khz(clk->params, vco) * 1000; return icst525_khz(clk->params, vco) * 1000;
} }
...@@ -76,56 +45,15 @@ EXPORT_SYMBOL(clk_round_rate); ...@@ -76,56 +45,15 @@ EXPORT_SYMBOL(clk_round_rate);
int clk_set_rate(struct clk *clk, unsigned long rate) int clk_set_rate(struct clk *clk, unsigned long rate)
{ {
int ret = -EIO; int ret = -EIO;
if (clk->setvco) { if (clk->setvco) {
struct icst525_vco vco; struct icst525_vco vco;
vco = icst525_khz_to_vco(clk->params, rate / 1000); vco = icst525_khz_to_vco(clk->params, rate / 1000);
clk->rate = icst525_khz(clk->params, vco) * 1000; clk->rate = icst525_khz(clk->params, vco) * 1000;
printk("Clock %s: setting VCO reg params: S=%d R=%d V=%d\n",
clk->name, vco.s, vco.r, vco.v);
clk->setvco(clk, vco); clk->setvco(clk, vco);
ret = 0; ret = 0;
} }
return 0; return ret;
} }
EXPORT_SYMBOL(clk_set_rate); EXPORT_SYMBOL(clk_set_rate);
/*
* These are fixed clocks.
*/
static struct clk kmi_clk = {
.name = "KMIREFCLK",
.rate = 24000000,
};
static struct clk uart_clk = {
.name = "UARTCLK",
.rate = 14745600,
};
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 int __init clk_init(void)
{
clk_register(&kmi_clk);
clk_register(&uart_clk);
return 0;
}
arch_initcall(clk_init);
/*
* linux/arch/arm/mach-integrator/clock.h
*
* Copyright (C) 2004 ARM Limited.
* Written by Deep Blue Solutions Limited.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
struct module;
struct icst525_params;
struct clk {
struct list_head node;
unsigned long rate;
struct module *owner;
const char *name;
const struct icst525_params *params;
void *data;
void (*setvco)(struct clk *, struct icst525_vco vco);
};
int clk_register(struct clk *clk);
void clk_unregister(struct clk *clk);
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include <linux/amba/serial.h> #include <linux/amba/serial.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/hardware/arm_timer.h> #include <asm/hardware/arm_timer.h>
...@@ -108,10 +110,43 @@ static struct amba_device *amba_devs[] __initdata = { ...@@ -108,10 +110,43 @@ static struct amba_device *amba_devs[] __initdata = {
&kmi1_device, &kmi1_device,
}; };
/*
* These are fixed clocks.
*/
static struct clk clk24mhz = {
.rate = 24000000,
};
static struct clk uartclk = {
.rate = 14745600,
};
static struct clk_lookup lookups[] __initdata = {
{ /* UART0 */
.dev_id = "mb:16",
.clk = &uartclk,
}, { /* UART1 */
.dev_id = "mb:17",
.clk = &uartclk,
}, { /* KMI0 */
.dev_id = "mb:18",
.clk = &clk24mhz,
}, { /* KMI1 */
.dev_id = "mb:19",
.clk = &clk24mhz,
}, { /* MMCI - IntegratorCP */
.dev_id = "mb:1c",
.clk = &uartclk,
}
};
static int __init integrator_init(void) static int __init integrator_init(void)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(lookups); i++)
clkdev_add(&lookups[i]);
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
struct amba_device *d = amba_devs[i]; struct amba_device *d = amba_devs[i];
amba_device_register(d, &iomem_resource); amba_device_register(d, &iomem_resource);
......
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>
#include <asm/hardware/icst525.h> #include <asm/hardware/icst525.h>
#include <mach/lm.h> #include <mach/lm.h>
#include <mach/impd1.h> #include <mach/impd1.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include "clock.h"
static int module_id; static int module_id;
module_param_named(lmid, module_id, int, 0444); module_param_named(lmid, module_id, int, 0444);
...@@ -37,6 +37,7 @@ MODULE_PARM_DESC(lmid, "logic module stack position"); ...@@ -37,6 +37,7 @@ MODULE_PARM_DESC(lmid, "logic module stack position");
struct impd1_module { struct impd1_module {
void __iomem *base; void __iomem *base;
struct clk vcos[2]; struct clk vcos[2];
struct clk_lookup *clks[3];
}; };
static const struct icst525_params impd1_vco_params = { static const struct icst525_params impd1_vco_params = {
...@@ -339,9 +340,8 @@ static struct impd1_device impd1_devs[] = { ...@@ -339,9 +340,8 @@ static struct impd1_device impd1_devs[] = {
} }
}; };
static const char *impd1_vconames[2] = { static struct clk fixed_14745600 = {
"CLCDCLK", .rate = 14745600,
"AUXVCO2",
}; };
static int impd1_probe(struct lm_device *dev) static int impd1_probe(struct lm_device *dev)
...@@ -374,14 +374,20 @@ static int impd1_probe(struct lm_device *dev) ...@@ -374,14 +374,20 @@ static int impd1_probe(struct lm_device *dev)
for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) { for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) {
impd1->vcos[i].owner = THIS_MODULE, impd1->vcos[i].owner = THIS_MODULE,
impd1->vcos[i].name = impd1_vconames[i],
impd1->vcos[i].params = &impd1_vco_params, impd1->vcos[i].params = &impd1_vco_params,
impd1->vcos[i].data = impd1, impd1->vcos[i].data = impd1,
impd1->vcos[i].setvco = impd1_setvco; impd1->vcos[i].setvco = impd1_setvco;
clk_register(&impd1->vcos[i]);
} }
impd1->clks[0] = clkdev_alloc(&impd1->vcos[0], NULL, "lm%x:01000",
dev->id);
impd1->clks[1] = clkdev_alloc(&fixed_14745600, NULL, "lm%x:00100",
dev->id);
impd1->clks[2] = clkdev_alloc(&fixed_14745600, NULL, "lm%x:00200",
dev->id);
for (i = 0; i < ARRAY_SIZE(impd1->clks); i++)
clkdev_add(impd1->clks[i]);
for (i = 0; i < ARRAY_SIZE(impd1_devs); i++) { for (i = 0; i < ARRAY_SIZE(impd1_devs); i++) {
struct impd1_device *idev = impd1_devs + i; struct impd1_device *idev = impd1_devs + i;
struct amba_device *d; struct amba_device *d;
...@@ -434,8 +440,8 @@ static void impd1_remove(struct lm_device *dev) ...@@ -434,8 +440,8 @@ static void impd1_remove(struct lm_device *dev)
device_for_each_child(&dev->dev, NULL, impd1_remove_one); device_for_each_child(&dev->dev, NULL, impd1_remove_one);
for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) for (i = 0; i < ARRAY_SIZE(impd1->clks); i++)
clk_unregister(&impd1->vcos[i]); clkdev_drop(impd1->clks[i]);
lm_set_drvdata(dev, NULL); lm_set_drvdata(dev, NULL);
......
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#include <linux/module.h>
#include <asm/hardware/icst525.h>
struct clk {
unsigned long rate;
struct module *owner;
const struct icst525_params *params;
void *data;
void (*setvco)(struct clk *, struct icst525_vco vco);
};
static inline int __clk_get(struct clk *clk)
{
return try_module_get(clk->owner);
}
static inline void __clk_put(struct clk *clk)
{
module_put(clk->owner);
}
#endif
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -38,7 +40,6 @@ ...@@ -38,7 +40,6 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include "common.h" #include "common.h"
#include "clock.h"
#define INTCP_PA_MMC_BASE 0x1c000000 #define INTCP_PA_MMC_BASE 0x1c000000
#define INTCP_PA_AACI_BASE 0x1d000000 #define INTCP_PA_AACI_BASE 0x1d000000
...@@ -289,15 +290,16 @@ static void cp_auxvco_set(struct clk *clk, struct icst525_vco vco) ...@@ -289,15 +290,16 @@ static void cp_auxvco_set(struct clk *clk, struct icst525_vco vco)
writel(0, CM_LOCK); writel(0, CM_LOCK);
} }
static struct clk cp_clcd_clk = { static struct clk cp_auxclk = {
.name = "CLCDCLK",
.params = &cp_auxvco_params, .params = &cp_auxvco_params,
.setvco = cp_auxvco_set, .setvco = cp_auxvco_set,
}; };
static struct clk cp_mmci_clk = { static struct clk_lookup cp_lookups[] = {
.name = "MCLK", { /* CLCD */
.rate = 14745600, .dev_id = "mb:c0",
.clk = &cp_auxclk,
},
}; };
/* /*
...@@ -554,8 +556,8 @@ static void __init intcp_init(void) ...@@ -554,8 +556,8 @@ static void __init intcp_init(void)
{ {
int i; int i;
clk_register(&cp_clcd_clk); for (i = 0; i < ARRAY_SIZE(cp_lookups); i++)
clk_register(&cp_mmci_clk); clkdev_add(&cp_lookups[i]);
platform_add_devices(intcp_devs, ARRAY_SIZE(intcp_devs)); platform_add_devices(intcp_devs, ARRAY_SIZE(intcp_devs));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment