Skip to content

Commit

Permalink
Merge branch 'dev/cleanup-clocks' into for-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Kukjin Kim committed Jan 5, 2011
2 parents f56d463 + 957c461 commit ab10f1d
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 98 deletions.
19 changes: 3 additions & 16 deletions arch/arm/mach-s3c64xx/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ int s3c64xx_sclk_ctrl(struct clk *clk, int enable)
return s3c64xx_gate(S3C_SCLK_GATE, clk, enable);
}

static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "nand",
.id = -1,
Expand Down Expand Up @@ -834,28 +834,15 @@ static struct clk *clks[] __initdata = {
void __init s3c64xx_register_clocks(unsigned long xtal,
unsigned armclk_divlimit)
{
struct clk *clkp;
int ret;
int ptr;

armclk_mask = armclk_divlimit;

s3c24xx_register_baseclocks(xtal);
s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));

s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkp = init_clocks_disable;
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {

ret = s3c24xx_register_clock(clkp);
if (ret < 0) {
printk(KERN_ERR "Failed to register clock %s (%d)\n",
clkp->name, ret);
}

(clkp->enable)(clkp, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c24xx_register_clocks(clks1, ARRAY_SIZE(clks1));
s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
Expand Down
16 changes: 3 additions & 13 deletions arch/arm/mach-s5p6442/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void __init_or_cpufreq s5p6442_setup_clocks(void)
clk_pclkd1.rate = pclkd1;
}

static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "pdma",
.id = -1,
Expand Down Expand Up @@ -408,23 +408,13 @@ static struct clk *clks[] __initdata = {

void __init s5p6442_register_clocks(void)
{
struct clk *clkptr;
int i, ret;

s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));

s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkptr = init_clocks_disable;
for (i = 0; i < ARRAY_SIZE(init_clocks_disable); i++, clkptr++) {
ret = s3c24xx_register_clock(clkptr);
if (ret < 0) {
printk(KERN_ERR "Fail to register clock %s (%d)\n",
clkptr->name, ret);
} else
(clkptr->enable)(clkptr, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c_pwmclk_init();
}
16 changes: 3 additions & 13 deletions arch/arm/mach-s5p64x0/clock-s5p6440.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static struct clksrc_clk clk_pclk_low = {
* recommended to keep the following clocks disabled until the driver requests
* for enabling the clock.
*/
static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "nand",
.id = -1,
Expand Down Expand Up @@ -602,8 +602,6 @@ static struct clk *clks[] __initdata = {

void __init s5p6440_register_clocks(void)
{
struct clk *clkp;
int ret;
int ptr;

s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
Expand All @@ -614,16 +612,8 @@ void __init s5p6440_register_clocks(void)
s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkp = init_clocks_disable;
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {

ret = s3c24xx_register_clock(clkp);
if (ret < 0) {
printk(KERN_ERR "Failed to register clock %s (%d)\n",
clkp->name, ret);
}
(clkp->enable)(clkp, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c_pwmclk_init();
}
16 changes: 3 additions & 13 deletions arch/arm/mach-s5p64x0/clock-s5p6450.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static struct clksrc_clk clk_pclk_low = {
* recommended to keep the following clocks disabled until the driver requests
* for enabling the clock.
*/
static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "usbhost",
.id = -1,
Expand Down Expand Up @@ -651,8 +651,6 @@ void __init_or_cpufreq s5p6450_setup_clocks(void)

void __init s5p6450_register_clocks(void)
{
struct clk *clkp;
int ret;
int ptr;

for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
Expand All @@ -661,16 +659,8 @@ void __init s5p6450_register_clocks(void)
s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkp = init_clocks_disable;
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {

ret = s3c24xx_register_clock(clkp);
if (ret < 0) {
printk(KERN_ERR "Failed to register clock %s (%d)\n",
clkp->name, ret);
}
(clkp->enable)(clkp, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c_pwmclk_init();
}
16 changes: 3 additions & 13 deletions arch/arm/mach-s5pc100/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ static int s5pc100_sclk1_ctrl(struct clk *clk, int enable)
* recommended to keep the following clocks disabled until the driver requests
* for enabling the clock.
*/
static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "cssys",
.id = -1,
Expand Down Expand Up @@ -1381,8 +1381,6 @@ static struct clk *clks[] __initdata = {

void __init s5pc100_register_clocks(void)
{
struct clk *clkp;
int ret;
int ptr;

s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
Expand All @@ -1393,16 +1391,8 @@ void __init s5pc100_register_clocks(void)
s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkp = init_clocks_disable;
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {

ret = s3c24xx_register_clock(clkp);
if (ret < 0) {
printk(KERN_ERR "Failed to register clock %s (%d)\n",
clkp->name, ret);
}
(clkp->enable)(clkp, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c_pwmclk_init();
}
19 changes: 4 additions & 15 deletions arch/arm/mach-s5pv210/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static struct clk_ops clk_fout_apll_ops = {
.get_rate = s5pv210_clk_fout_apll_get_rate,
};

static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "pdma",
.id = 0,
Expand Down Expand Up @@ -1226,29 +1226,18 @@ static struct clk *clks[] __initdata = {

void __init s5pv210_register_clocks(void)
{
struct clk *clkp;
int ret;
int ptr;

ret = s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
if (ret > 0)
printk(KERN_ERR "Failed to register %u clocks\n", ret);
s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));

for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
s3c_register_clksrc(sysclks[ptr], 1);

s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkp = init_clocks_disable;
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {
ret = s3c24xx_register_clock(clkp);
if (ret < 0) {
printk(KERN_ERR "Failed to register clock %s (%d)\n",
clkp->name, ret);
}
(clkp->enable)(clkp, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c_pwmclk_init();
}
19 changes: 4 additions & 15 deletions arch/arm/mach-s5pv310/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ static struct clksrc_clk clk_sclk_vpll = {
.reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 8, .size = 1 },
};

static struct clk init_clocks_disable[] = {
static struct clk init_clocks_off[] = {
{
.name = "timers",
.id = -1,
Expand Down Expand Up @@ -1105,29 +1105,18 @@ static struct clk *clks[] __initdata = {

void __init s5pv310_register_clocks(void)
{
struct clk *clkp;
int ret;
int ptr;

ret = s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
if (ret > 0)
printk(KERN_ERR "Failed to register %u clocks\n", ret);
s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));

for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
s3c_register_clksrc(sysclks[ptr], 1);

s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));

clkp = init_clocks_disable;
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {
ret = s3c24xx_register_clock(clkp);
if (ret < 0) {
printk(KERN_ERR "Failed to register clock %s (%d)\n",
clkp->name, ret);
}
(clkp->enable)(clkp, 0);
}
s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));

s3c_pwmclk_init();
}

0 comments on commit ab10f1d

Please sign in to comment.