lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] ep93xx: convert to clkdev and match clocks by struct device where possible

Browse Source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2008-11-30 17:11:49 +00:00
committed by Russell King
parent 5e1dbdb458
commit ae696fd532
3 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@@ -276,6 +276,7 @@ config ARCH_EP93XX
select ARM_VIC select ARM_VIC
select GENERIC_GPIO select GENERIC_GPIO
select HAVE_CLK select HAVE_CLK
select COMMON_CLKDEV
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
help help
This enables support for the Cirrus EP93xx series of CPUs. This enables support for the Cirrus EP93xx series of CPUs.

66
arch/arm/mach-ep93xx/clock.c
View File

@@ -16,11 +16,12 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/clkdev.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <mach/hardware.h> #include <mach/hardware.h>
struct clk { struct clk {
char *name;
unsigned long rate; unsigned long rate;
int users; int users;
u32 enable_reg; u32 enable_reg;
@@ -28,53 +29,33 @@ struct clk {
}; };
static struct clk clk_uart = { static struct clk clk_uart = {
.name = "UARTCLK",
.rate = 14745600, .rate = 14745600,
}; };
static struct clk clk_pll1 = { static struct clk clk_pll1;
.name = "pll1", static struct clk clk_f;
}; static struct clk clk_h;
static struct clk clk_f = { static struct clk clk_p;
.name = "fclk", static struct clk clk_pll2;
};
static struct clk clk_h = {
.name = "hclk",
};
static struct clk clk_p = {
.name = "pclk",
};
static struct clk clk_pll2 = {
.name = "pll2",
};
static struct clk clk_usb_host = { static struct clk clk_usb_host = {
.name = "usb_host",
.enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL,
.enable_mask = EP93XX_SYSCON_CLOCK_USH_EN, .enable_mask = EP93XX_SYSCON_CLOCK_USH_EN,
}; };
#define INIT_CK(dev,con,ck) \
{ .dev_id = dev, .con_id = con, .clk = ck }
static struct clk *clocks[] = { static struct clk_lookup clocks[] = {
&clk_uart, INIT_CK("apb:uart1", NULL, &clk_uart),
&clk_pll1, INIT_CK("apb:uart2", NULL, &clk_uart),
&clk_f, INIT_CK("apb:uart3", NULL, &clk_uart),
&clk_h, INIT_CK(NULL, "pll1", &clk_pll1),
&clk_p, INIT_CK(NULL, "fclk", &clk_f),
&clk_pll2, INIT_CK(NULL, "hclk", &clk_h),
&clk_usb_host, INIT_CK(NULL, "pclk", &clk_p),
INIT_CK(NULL, "pll2", &clk_pll2),
INIT_CK(NULL, "usb_host", &clk_usb_host),
}; };
struct clk *clk_get(struct device *dev, const char *id)
{
int i;
for (i = 0; i < ARRAY_SIZE(clocks); i++) {
if (!strcmp(clocks[i]->name, id))
return clocks[i];
}
return ERR_PTR(-ENOENT);
}
EXPORT_SYMBOL(clk_get);
int clk_enable(struct clk *clk) int clk_enable(struct clk *clk)
{ {
@@ -106,12 +87,6 @@ unsigned long clk_get_rate(struct clk *clk)
} }
EXPORT_SYMBOL(clk_get_rate); EXPORT_SYMBOL(clk_get_rate);
void clk_put(struct clk *clk)
{
}
EXPORT_SYMBOL(clk_put);
static char fclk_divisors[] = { 1, 2, 4, 8, 16, 1, 1, 1 }; static char fclk_divisors[] = { 1, 2, 4, 8, 16, 1, 1, 1 };
static char hclk_divisors[] = { 1, 2, 4, 5, 6, 8, 16, 32 }; static char hclk_divisors[] = { 1, 2, 4, 5, 6, 8, 16, 32 };
@@ -138,6 +113,7 @@ static unsigned long calc_pll_rate(u32 config_word)
static int __init ep93xx_clock_init(void) static int __init ep93xx_clock_init(void)
{ {
u32 value; u32 value;
int i;
value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1); value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1);
if (!(value & 0x00800000)) { /* PLL1 bypassed? */ if (!(value & 0x00800000)) { /* PLL1 bypassed? */
@@ -165,6 +141,8 @@ static int __init ep93xx_clock_init(void)
clk_f.rate / 1000000, clk_h.rate / 1000000, clk_f.rate / 1000000, clk_h.rate / 1000000,
clk_p.rate / 1000000); clk_p.rate / 1000000);
for (i = 0; i < ARRAY_SIZE(clocks); i++)
clkdev_add(&clocks[i]);
return 0; return 0;
} }
arch_initcall(ep93xx_clock_init); arch_initcall(ep93xx_clock_init);

7
arch/arm/mach-ep93xx/include/mach/clkdev.h Normal file
View File

@@ -0,0 +1,7 @@
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
#endif