diff options
Diffstat (limited to 'arch/arm/plat-s3c64xx')
| -rw-r--r-- | arch/arm/plat-s3c64xx/s3c6400-clock.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c index 6ffa21eb1b91..ffd56deb9e81 100644 --- a/arch/arm/plat-s3c64xx/s3c6400-clock.c +++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c | |||
| @@ -46,6 +46,7 @@ static struct clk clk_ext_xtal_mux = { | |||
| 46 | #define clk_fin_epll clk_ext_xtal_mux | 46 | #define clk_fin_epll clk_ext_xtal_mux |
| 47 | 47 | ||
| 48 | #define clk_fout_mpll clk_mpll | 48 | #define clk_fout_mpll clk_mpll |
| 49 | #define clk_fout_epll clk_epll | ||
| 49 | 50 | ||
| 50 | struct clk_sources { | 51 | struct clk_sources { |
| 51 | unsigned int nr_sources; | 52 | unsigned int nr_sources; |
| @@ -88,11 +89,6 @@ static struct clksrc_clk clk_mout_apll = { | |||
| 88 | .sources = &clk_src_apll, | 89 | .sources = &clk_src_apll, |
| 89 | }; | 90 | }; |
| 90 | 91 | ||
| 91 | static struct clk clk_fout_epll = { | ||
| 92 | .name = "fout_epll", | ||
| 93 | .id = -1, | ||
| 94 | }; | ||
| 95 | |||
| 96 | static struct clk *clk_src_epll_list[] = { | 92 | static struct clk *clk_src_epll_list[] = { |
| 97 | [0] = &clk_fin_epll, | 93 | [0] = &clk_fin_epll, |
| 98 | [1] = &clk_fout_epll, | 94 | [1] = &clk_fout_epll, |
| @@ -715,7 +711,6 @@ static struct clk *clks[] __initdata = { | |||
| 715 | &clk_iis_cd1, | 711 | &clk_iis_cd1, |
| 716 | &clk_pcm_cd, | 712 | &clk_pcm_cd, |
| 717 | &clk_mout_epll.clk, | 713 | &clk_mout_epll.clk, |
| 718 | &clk_fout_epll, | ||
| 719 | &clk_mout_mpll.clk, | 714 | &clk_mout_mpll.clk, |
| 720 | &clk_dout_mpll, | 715 | &clk_dout_mpll, |
| 721 | &clk_mmc0.clk, | 716 | &clk_mmc0.clk, |
| @@ -760,7 +755,4 @@ void __init s3c6400_register_clocks(unsigned armclk_divlimit) | |||
| 760 | clkp->name, ret); | 755 | clkp->name, ret); |
| 761 | } | 756 | } |
| 762 | } | 757 | } |
| 763 | |||
| 764 | clk_mpll.parent = &clk_mout_mpll.clk; | ||
| 765 | clk_epll.parent = &clk_mout_epll.clk; | ||
| 766 | } | 758 | } |
