diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 15:52:04 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 15:52:04 +0100 |
| commit | 7f2754378f3522a42daafdbb9d2385f341008454 (patch) | |
| tree | 7a6223f270cdf53067a70c2e86b2190d3577c23d /arch/arm/mach-s3c2443 | |
| parent | Merge branch 'next-s3c24xx' into next-merged (diff) | |
| parent | [ARM] S3C64XX: Correct the EINT IRQ type configuration (diff) | |
| download | linux-7f2754378f3522a42daafdbb9d2385f341008454.tar.xz linux-7f2754378f3522a42daafdbb9d2385f341008454.zip | |
Merge branch 'next-s3c64xx' into next-merged
Diffstat (limited to 'arch/arm/mach-s3c2443')
| -rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 1df8429242b8..fdd4ec335a77 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c @@ -147,12 +147,6 @@ static unsigned long s3c2443_roundrate_clksrc256(struct clk *clk, /* clock selections */ -/* CPU EXTCLK input */ -static struct clk clk_ext = { - .name = "ext", - .id = -1, -}; - static struct clk clk_mpllref = { .name = "mpllref", .parent = &clk_xtal, @@ -167,14 +161,6 @@ static struct clk clk_mpll = { }; #endif -static struct clk clk_epllref; - -static struct clk clk_epll = { - .name = "epll", - .parent = &clk_epllref, - .id = -1, -}; - static struct clk clk_i2s_ext = { .name = "i2s-ext", .id = -1, @@ -1072,6 +1058,7 @@ void __init s3c2443_init_clocks(int xtal) } clk_epll.rate = s3c2443_get_epll(epllcon, xtal); + clk_epll.parent = &clk_epllref; clk_usb_bus.parent = &clk_usb_bus_host; /* ensure usb bus clock is within correct rate of 48MHz */ @@ -1120,4 +1107,6 @@ void __init s3c2443_init_clocks(int xtal) (clkp->enable)(clkp, 0); } + + s3c_pwmclk_init(); } |