renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

sh: Use arch_flags to simplify sh7722 siu clock code

Browse Source 
Make use of arch_flags to simplify the SIU clock code.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Magnus Damm 2008-07-17 18:52:19 +09:00 committed by Paul Mundt
parent 5c8f9d94fe
commit 3fec18bd60
1 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
arch/sh/kernel/cpu/sh4a/clock-sh7722.c
View File

@ -411,40 +411,16 @@ static struct clk_ops sh7722_frqcr_clk_ops = {
* clock ops methods for SIU A/B and IrDA clock * clock ops methods for SIU A/B and IrDA clock
* *
*/ */
static int sh7722_siu_which(struct clk *clk)
{
if (!strcmp(clk->name, "siu_a_clk"))
return 0;
if (!strcmp(clk->name, "siu_b_clk"))
return 1;
#if defined(CONFIG_CPU_SUBTYPE_SH7722)
if (!strcmp(clk->name, "irda_clk"))
return 2;
#endif
return -EINVAL;
}
static unsigned long sh7722_siu_regs[] = {
[0] = SCLKACR,
[1] = SCLKBCR,
#if defined(CONFIG_CPU_SUBTYPE_SH7722)
[2] = IrDACLKCR,
#endif
};
static int sh7722_siu_start_stop(struct clk *clk, int enable) static int sh7722_siu_start_stop(struct clk *clk, int enable)
{ {
int siu = sh7722_siu_which(clk);
unsigned long r; unsigned long r;
if (siu < 0) r = ctrl_inl(clk->arch_flags);
return siu;
BUG_ON(siu > 2);
r = ctrl_inl(sh7722_siu_regs[siu]);
if (enable) if (enable)
ctrl_outl(r & ~(1 << 8), sh7722_siu_regs[siu]); ctrl_outl(r & ~(1 << 8), clk->arch_flags);
else else
ctrl_outl(r | (1 << 8), sh7722_siu_regs[siu]); ctrl_outl(r | (1 << 8), clk->arch_flags);
return 0; return 0;
} }
@ -496,31 +472,23 @@ static void sh7722_video_recalc(struct clk *clk)
static int sh7722_siu_set_rate(struct clk *clk, unsigned long rate, int algo_id) static int sh7722_siu_set_rate(struct clk *clk, unsigned long rate, int algo_id)
{ {
int siu = sh7722_siu_which(clk);
unsigned long r; unsigned long r;
int div; int div;
if (siu < 0) r = ctrl_inl(clk->arch_flags);
return siu;
BUG_ON(siu > 2);
r = ctrl_inl(sh7722_siu_regs[siu]);
div = sh7722_find_divisors(clk->parent->rate, rate); div = sh7722_find_divisors(clk->parent->rate, rate);
if (div < 0) if (div < 0)
return div; return div;
r = (r & ~0xF) | div; r = (r & ~0xF) | div;
ctrl_outl(r, sh7722_siu_regs[siu]); ctrl_outl(r, clk->arch_flags);
return 0; return 0;
} }
static void sh7722_siu_recalc(struct clk *clk) static void sh7722_siu_recalc(struct clk *clk)
{ {
int siu = sh7722_siu_which(clk);
unsigned long r; unsigned long r;
if (siu < 0) r = ctrl_inl(clk->arch_flags);
return /* siu */ ;
BUG_ON(siu > 2);
r = ctrl_inl(sh7722_siu_regs[siu]);
clk->rate = clk->parent->rate * 2 / divisors2[r & 0xF]; clk->rate = clk->parent->rate * 2 / divisors2[r & 0xF];
} }
@ -567,17 +535,20 @@ static struct clk sh7722_sdram_clock = {
*/ */
static struct clk sh7722_siu_a_clock = { static struct clk sh7722_siu_a_clock = {
.name = "siu_a_clk", .name = "siu_a_clk",
.arch_flags = SCLKACR,
.ops = &sh7722_siu_clk_ops, .ops = &sh7722_siu_clk_ops,
}; };
static struct clk sh7722_siu_b_clock = { static struct clk sh7722_siu_b_clock = {
.name = "siu_b_clk", .name = "siu_b_clk",
.arch_flags = SCLKBCR,
.ops = &sh7722_siu_clk_ops, .ops = &sh7722_siu_clk_ops,
}; };
#if defined(CONFIG_CPU_SUBTYPE_SH7722) #if defined(CONFIG_CPU_SUBTYPE_SH7722)
static struct clk sh7722_irda_clock = { static struct clk sh7722_irda_clock = {
.name = "irda_clk", .name = "irda_clk",
.arch_flags = IrDACLKCR,
.ops = &sh7722_siu_clk_ops, .ops = &sh7722_siu_clk_ops,
}; };
#endif #endif