Thread (4 messages) flat view 4 messages, 2 authors, 2012-08-28
STALE5093d

[PATCH] ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock

From: Kukjin Kim <hidden>
Date: 2012-08-27 22:58:14
Also in: linux-samsung-soc

On 08/27/12 13:12, Sylwester Nawrocki wrote:
quoted hunk ↗ jump to hunk
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>
---
  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 cb2883d..749220f 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)
  	return 0;
  }

+static unsigned long s3c2440_camif_upll_getrate(struct clk *clk)
+{
+	unsigned long parent_rate = clk_get_rate(clk->parent);
+	unsigned long camdivn =  __raw_readl(S3C2440_CAMDIVN);
+
+	if (!(camdivn&  S3C2440_CAMDIVN_CAMCLK_SEL))
+		return parent_rate;
+
+	camdivn&= S3C2440_CAMDIVN_CAMCLK_MASK;
+
+	return parent_rate / (camdivn + 1) / 2;
Well, why do we need '/ 2' here?
quoted hunk ↗ jump to hunk
+}
+
  /* Extra S3C2440 clocks */

  static struct clk s3c2440_clk_cam = {
@@ -99,6 +112,7 @@ static struct clk s3c2440_clk_cam_upll = {
  	.name		= "camif-upll",
  	.ops		=&(struct clk_ops) {
  		.set_rate	= s3c2440_camif_upll_setrate,
+		.get_rate	= s3c2440_camif_upll_getrate,
  		.round_rate	= s3c2440_camif_upll_round,
  	},
  };
Thanks.

Best regards,
Kgene.
--
Kukjin Kim [off-list ref], Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help