diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-08-28 18:59:42 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-20 19:04:40 -0400 |
commit | 98a7069ba04faf3313dcc5fa69476fc3b5ab3794 (patch) | |
tree | 91fa522f3693f5e2275fe142644175d164a3d72d /arch/arm/mach-s3c24xx | |
parent | 859a09e671772db5781d27c9c0b5828a3bca094c (diff) |
ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock
Add missing get_rate callback for the "camif-upll" clock, so frequency
of this clock is properly reported with clk_get_rate().
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2440.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2440.c b/arch/arm/mach-s3c24xx/clock-s3c2440.c index cb2883d553b5..749220f91a70 100644 --- a/arch/arm/mach-s3c24xx/clock-s3c2440.c +++ b/arch/arm/mach-s3c24xx/clock-s3c2440.c | |||
@@ -87,6 +87,19 @@ static int s3c2440_camif_upll_setrate(struct clk *clk, unsigned long rate) | |||
87 | return 0; | 87 | return 0; |
88 | } | 88 | } |
89 | 89 | ||
90 | static unsigned long s3c2440_camif_upll_getrate(struct clk *clk) | ||
91 | { | ||
92 | unsigned long parent_rate = clk_get_rate(clk->parent); | ||
93 | unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); | ||
94 | |||
95 | if (!(camdivn & S3C2440_CAMDIVN_CAMCLK_SEL)) | ||
96 | return parent_rate; | ||
97 | |||
98 | camdivn &= S3C2440_CAMDIVN_CAMCLK_MASK; | ||
99 | |||
100 | return parent_rate / (camdivn + 1) / 2; | ||
101 | } | ||
102 | |||
90 | /* Extra S3C2440 clocks */ | 103 | /* Extra S3C2440 clocks */ |
91 | 104 | ||
92 | static struct clk s3c2440_clk_cam = { | 105 | static struct clk s3c2440_clk_cam = { |
@@ -99,6 +112,7 @@ static struct clk s3c2440_clk_cam_upll = { | |||
99 | .name = "camif-upll", | 112 | .name = "camif-upll", |
100 | .ops = &(struct clk_ops) { | 113 | .ops = &(struct clk_ops) { |
101 | .set_rate = s3c2440_camif_upll_setrate, | 114 | .set_rate = s3c2440_camif_upll_setrate, |
115 | .get_rate = s3c2440_camif_upll_getrate, | ||
102 | .round_rate = s3c2440_camif_upll_round, | 116 | .round_rate = s3c2440_camif_upll_round, |
103 | }, | 117 | }, |
104 | }; | 118 | }; |