hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: Merge next-samsung-clock2 

Merge branch 'next-samsung-clock2' into next-samsung-try7
This commit is contained in:
Ben Dooks 2010-01-19 18:36:12 +09:00
parent 668dfc7527 f9e011b6b3
commit ea2de1dc8b
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/plat-s5pc1xx/clock.c
View File

@ -64,18 +64,12 @@ struct clk clk_54m = {
.rate = 54000000, .rate = 54000000,
}; };
static int clk_dummy_enable(struct clk *clk, int enable)
{
return 0;
}
struct clk clk_hd0 = { struct clk clk_hd0 = {
.name = "hclkd0", .name = "hclkd0",
.id = -1, .id = -1,
.rate = 0, .rate = 0,
.parent = NULL, .parent = NULL,
.ctrlbit = 0, .ctrlbit = 0,
.enable = clk_dummy_enable,
.ops = &clk_ops_def_setrate, .ops = &clk_ops_def_setrate,
}; };
@ -86,7 +80,6 @@ struct clk clk_pd0 = {
.parent = NULL, .parent = NULL,
.ctrlbit = 0, .ctrlbit = 0,
.ops = &clk_ops_def_setrate, .ops = &clk_ops_def_setrate,
.enable = clk_dummy_enable,
}; };
static int s5pc1xx_clk_gate(void __iomem *reg, struct clk *clk, int enable) static int s5pc1xx_clk_gate(void __iomem *reg, struct clk *clk, int enable)
@ -680,6 +673,8 @@ static struct clk s5pc100_init_clocks[] = {
static struct clk *clks[] __initdata = { static struct clk *clks[] __initdata = {
&clk_ext, &clk_ext,
&clk_epll, &clk_epll,
&clk_pd0,
&clk_hd0,
&clk_27m, &clk_27m,
&clk_48m, &clk_48m,
&clk_54m, &clk_54m,

25
arch/arm/plat-samsung/clock-clksrc.c
View File

@ -60,7 +60,7 @@ static int s3c_setrate_clksrc(struct clk *clk, unsigned long rate)
rate = clk_round_rate(clk, rate); rate = clk_round_rate(clk, rate);
div = clk_get_rate(clk->parent) / rate; div = clk_get_rate(clk->parent) / rate;
if (div > 16) if (div > (1 << sclk->reg_div.size))
return -EINVAL; return -EINVAL;
val = __raw_readl(reg); val = __raw_readl(reg);
@ -102,7 +102,9 @@ static int s3c_setparent_clksrc(struct clk *clk, struct clk *parent)
static unsigned long s3c_roundrate_clksrc(struct clk *clk, static unsigned long s3c_roundrate_clksrc(struct clk *clk,
unsigned long rate) unsigned long rate)
{ {
struct clksrc_clk *sclk = to_clksrc(clk);
unsigned long parent_rate = clk_get_rate(clk->parent); unsigned long parent_rate = clk_get_rate(clk->parent);
int max_div = 1 << sclk->reg_div.size;
int div; int div;
if (rate >= parent_rate) if (rate >= parent_rate)
@ -114,8 +116,8 @@ static unsigned long s3c_roundrate_clksrc(struct clk *clk,
if (div == 0) if (div == 0)
div = 1; div = 1;
if (div > 16) if (div > max_div)
div = 16; div = max_div;
rate = parent_rate / div; rate = parent_rate / div;
} }
@ -129,11 +131,16 @@ void __init_or_cpufreq s3c_set_clksrc(struct clksrc_clk *clk, bool announce)
{ {
struct clksrc_sources *srcs = clk->sources; struct clksrc_sources *srcs = clk->sources;
u32 mask = bit_mask(clk->reg_src.shift, clk->reg_src.size); u32 mask = bit_mask(clk->reg_src.shift, clk->reg_src.size);
u32 clksrc = 0; u32 clksrc;
if (!clk->reg_src.reg) {
if (!clk->clk.parent)
printk(KERN_ERR "%s: no parent clock specified\n",
clk->clk.name);
return;
}
if (clk->reg_src.reg)
clksrc = __raw_readl(clk->reg_src.reg); clksrc = __raw_readl(clk->reg_src.reg);
clksrc &= mask; clksrc &= mask;
clksrc >>= clk->reg_src.shift; clksrc >>= clk->reg_src.shift;
@ -172,9 +179,11 @@ void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)
{ {
int ret; int ret;
WARN_ON(!clksrc->reg_div.reg && !clksrc->reg_src.reg);
for (; size > 0; size--, clksrc++) { for (; size > 0; size--, clksrc++) {
if (!clksrc->reg_div.reg && !clksrc->reg_src.reg)
printk(KERN_ERR "%s: clock %s has no registers set\n",
__func__, clksrc->clk.name);
/* fill in the default functions */ /* fill in the default functions */
if (!clksrc->clk.ops) { if (!clksrc->clk.ops) {