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

Merge branch 'clks' into devel

parents 773e9610 ee569c43
...@@ -271,6 +271,7 @@ config ARCH_EP93XX ...@@ -271,6 +271,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.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# Common support (must be linked before board specific support) # Common support (must be linked before board specific support)
obj-y += core.o clock.o obj-y += core.o
# Specific board support # Specific board support
obj-$(CONFIG_MACH_AAED2000) += aaed2000.o obj-$(CONFIG_MACH_AAED2000) += aaed2000.o
/*
* linux/arch/arm/mach-aaec2000/clock.c
*
* Copyright (C) 2005 Nicolas Bellido Y Ortega
*
* Based on linux/arch/arm/mach-integrator/clock.c
*
* 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.
*/
#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/mutex.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)
{
return 0;
}
EXPORT_SYMBOL(clk_enable);
void clk_disable(struct clk *clk)
{
}
EXPORT_SYMBOL(clk_disable);
unsigned long clk_get_rate(struct clk *clk)
{
return clk->rate;
}
EXPORT_SYMBOL(clk_get_rate);
long clk_round_rate(struct clk *clk, unsigned long rate)
{
return rate;
}
EXPORT_SYMBOL(clk_round_rate);
int clk_set_rate(struct clk *clk, unsigned long rate)
{
return 0;
}
EXPORT_SYMBOL(clk_set_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 int __init clk_init(void)
{
return 0;
}
arch_initcall(clk_init);
/*
* linux/arch/arm/mach-aaec2000/clock.h
*
* Copyright (C) 2005 Nicolas Bellido Y Ortega
*
* Based on linux/arch/arm/mach-integrator/clock.h
*
* 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 clk {
struct list_head node;
unsigned long rate;
struct module *owner;
const char *name;
void *data;
};
int clk_register(struct clk *clk);
void clk_unregister(struct clk *clk);
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/clk.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -30,7 +31,6 @@ ...@@ -30,7 +31,6 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include "core.h" #include "core.h"
#include "clock.h"
/* /*
* Common I/O mapping: * Common I/O mapping:
...@@ -229,9 +229,28 @@ static struct amba_device *amba_devs[] __initdata = { ...@@ -229,9 +229,28 @@ static struct amba_device *amba_devs[] __initdata = {
&clcd_device, &clcd_device,
}; };
static struct clk aaec2000_clcd_clk = { void clk_disable(struct clk *clk)
.name = "CLCDCLK", {
}; }
int clk_set_rate(struct clk *clk, unsigned long rate)
{
return 0;
}
int clk_enable(struct clk *clk)
{
return 0;
}
struct clk *clk_get(struct device *dev, const char *id)
{
return dev && strcmp(dev_name(dev), "mb:16") == 0 ? NULL : ERR_PTR(-ENOENT);
}
void clk_put(struct clk *clk)
{
}
void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd)
{ {
...@@ -265,8 +284,6 @@ static int __init aaec2000_init(void) ...@@ -265,8 +284,6 @@ static int __init aaec2000_init(void)
{ {
int i; int i;
clk_register(&aaec2000_clcd_clk);
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);
......
...@@ -16,11 +16,12 @@ ...@@ -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 { ...@@ -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) \
static struct clk *clocks[] = { { .dev_id = dev, .con_id = con, .clk = ck }
&clk_uart,
&clk_pll1, static struct clk_lookup clocks[] = {
&clk_f, INIT_CK("apb:uart1", NULL, &clk_uart),
&clk_h, INIT_CK("apb:uart2", NULL, &clk_uart),
&clk_p, INIT_CK("apb:uart3", NULL, &clk_uart),
&clk_pll2, INIT_CK(NULL, "pll1", &clk_pll1),
&clk_usb_host, INIT_CK(NULL, "fclk", &clk_f),
INIT_CK(NULL, "hclk", &clk_h),
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) ...@@ -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) ...@@ -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) ...@@ -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);
#ifndef __ASM_MACH_CLKDEV_H
#define __ASM_MACH_CLKDEV_H
#define __clk_get(clk) ({ 1; })
#define __clk_put(clk) do { } while (0)
#endif
...@@ -14,21 +14,14 @@ ...@@ -14,21 +14,14 @@
#include <linux/err.h> #include <linux/err.h>
struct module; struct module;
struct icst525_params;
struct clk { struct clk {
struct list_head node; struct list_head node;
unsigned long rate; unsigned long rate;
struct module *owner; struct module *owner;
const char *name; const char *name;
// void *data;
// const struct icst525_params *params;
// void (*setvco)(struct clk *, struct icst525_vco vco);
}; };
int clk_register(struct clk *clk);
void clk_unregister(struct clk *clk);
/* ----- */ /* ----- */
#define MAINDIV1(c) (((c) >> 7) & 0x0f) #define MAINDIV1(c) (((c) >> 7) & 0x0f)
...@@ -79,31 +72,15 @@ unsigned int pclkfreq_get (void) ...@@ -79,31 +72,15 @@ unsigned int pclkfreq_get (void)
/* ----- */ /* ----- */
static LIST_HEAD(clocks);
static DECLARE_MUTEX(clocks_sem);
struct clk *clk_get (struct device *dev, const char *id) struct clk *clk_get (struct device *dev, const char *id)
{ {
struct clk *p; return dev && strcmp(dev_name(dev), "cldc-lh7a40x") == 0
struct clk *clk = ERR_PTR(-ENOENT); ? NULL : ERR_PTR(-ENOENT);
down (&clocks_sem);
list_for_each_entry (p, &clocks, node) {
if (strcmp (id, p->name) == 0
&& try_module_get(p->owner)) {
clk = p;
break;
}
}
up (&clocks_sem);
return clk;
} }
EXPORT_SYMBOL(clk_get); EXPORT_SYMBOL(clk_get);
void clk_put (struct clk *clk) void clk_put (struct clk *clk)
{ {
module_put(clk->owner);
} }
EXPORT_SYMBOL(clk_put); EXPORT_SYMBOL(clk_put);
...@@ -118,20 +95,9 @@ void clk_disable (struct clk *clk) ...@@ -118,20 +95,9 @@ void clk_disable (struct clk *clk)
} }
EXPORT_SYMBOL(clk_disable); EXPORT_SYMBOL(clk_disable);
int clk_use (struct clk *clk)
{
return 0;
}
EXPORT_SYMBOL(clk_use);
void clk_unuse (struct clk *clk)
{
}
EXPORT_SYMBOL(clk_unuse);
unsigned long clk_get_rate (struct clk *clk) unsigned long clk_get_rate (struct clk *clk)
{ {
return clk->rate; return 0;
} }
EXPORT_SYMBOL(clk_get_rate); EXPORT_SYMBOL(clk_get_rate);
...@@ -143,56 +109,6 @@ EXPORT_SYMBOL(clk_round_rate); ...@@ -143,56 +109,6 @@ 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; return -EIO;
return ret;
} }
EXPORT_SYMBOL(clk_set_rate); EXPORT_SYMBOL(clk_set_rate);
#if 0
/*
* These are fixed clocks.
*/
static struct clk kmi_clk = {
.name = "KMIREFCLK",
.rate = 24000000,
};
static struct clk uart_clk = {
.name = "UARTCLK",
.rate = 24000000,
};
static struct clk mmci_clk = {
.name = "MCLK",
.rate = 33000000,
};
#endif
static struct clk clcd_clk = {
.name = "CLCDCLK",
.rate = 0,
};
int clk_register (struct clk *clk)
{
down (&clocks_sem);
list_add (&clk->node, &clocks);
up (&clocks_sem);
return 0;
}
EXPORT_SYMBOL(clk_register);
void clk_unregister (struct clk *clk)
{
down (&clocks_sem);
list_del (&clk->node);
up (&clocks_sem);
}
EXPORT_SYMBOL(clk_unregister);
static int __init clk_init (void)
{
clk_register(&clcd_clk);
return 0;
}
arch_initcall(clk_init);
...@@ -22,14 +22,11 @@ ...@@ -22,14 +22,11 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/clcd.h> #include <linux/amba/clcd.h>
#include <linux/err.h>
#include <mach/netx-regs.h> #include <mach/netx-regs.h>
#include <mach/hardware.h> #include <mach/hardware.h>
struct clk {};
static struct clk fb_clk;
static struct clcd_panel *netx_panel; static struct clcd_panel *netx_panel;
void netx_clcd_enable(struct clcd_fb *fb) void netx_clcd_enable(struct clcd_fb *fb)
...@@ -85,7 +82,7 @@ int clk_enable(struct clk *clk) ...@@ -85,7 +82,7 @@ int clk_enable(struct clk *clk)
struct clk *clk_get(struct device *dev, const char *id) struct clk *clk_get(struct device *dev, const char *id)
{ {
return &fb_clk; return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT);
} }
void clk_put(struct clk *clk) void clk_put(struct clk *clk)
......
...@@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id) ...@@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id)
} }
host = mmc_priv(mmc); host = mmc_priv(mmc);
host->clk = clk_get(&dev->dev, "MCLK"); host->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(host->clk)) { if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk); ret = PTR_ERR(host->clk);
host->clk = NULL; host->clk = NULL;
......
...@@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id) ...@@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id)
goto free; goto free;
} }
uap->clk = clk_get(&dev->dev, "UARTCLK"); uap->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(uap->clk)) { if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk); ret = PTR_ERR(uap->clk);
goto unmap; goto unmap;
......
...@@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id) ...@@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id)
goto free; goto free;
} }
uap->clk = clk_get(&dev->dev, "UARTCLK"); uap->clk = clk_get(&dev->dev, NULL);
if (IS_ERR(uap->clk)) { if (IS_ERR(uap->clk)) {
ret = PTR_ERR(uap->clk); ret = PTR_ERR(uap->clk);
goto unmap; goto unmap;
......
...@@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb) ...@@ -343,7 +343,7 @@ static int clcdfb_register(struct clcd_fb *fb)
{ {
int ret; int ret;
fb->clk = clk_get(&fb->dev->dev, "CLCDCLK"); fb->clk = clk_get(&fb->dev->dev, NULL);
if (IS_ERR(fb->clk)) { if (IS_ERR(fb->clk)) {
ret = PTR_ERR(fb->clk); ret = PTR_ERR(fb->clk);
goto out; goto out;
......
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