From 1b6c7e0264671043d1712b05ec706ab16fb4857e Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 29 Aug 2005 22:46:31 +0100 Subject: [PATCH] --- yaml --- r: 6623 b: refs/heads/master c: 01b9c414828d951148a3792237ff3bf6e6debc85 h: refs/heads/master i: 6621: 421e8e2abe41c34af81291a8c7302da5b497187c 6619: b8845e47ebb54522f79ed82e045308a333a0b1b1 6615: 1a9a736a5d1bd7e9b09685d7e13de4198dd6cd6e 6607: b90ddba2cd9e7e789bfaa756632a6a04e19f36b5 6591: 06b61a00b4456d1a4dda38ecaaf318c619f389c4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2410/s3c2440-clock.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d50cfbb5633..d9dd47211036 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6b0bf213b4be478029b768fcee80058ace7150a +refs/heads/master: 01b9c414828d951148a3792237ff3bf6e6debc85 diff --git a/trunk/arch/arm/mach-s3c2410/s3c2440-clock.c b/trunk/arch/arm/mach-s3c2410/s3c2440-clock.c index b018a1f680ce..c67e0979aec3 100644 --- a/trunk/arch/arm/mach-s3c2410/s3c2440-clock.c +++ b/trunk/arch/arm/mach-s3c2410/s3c2440-clock.c @@ -68,6 +68,7 @@ static struct clk s3c2440_clk_ac97 = { static int s3c2440_clk_add(struct sys_device *sysdev) { unsigned long upllcon = __raw_readl(S3C2410_UPLLCON); + unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); struct clk *clk_h; struct clk *clk_p; struct clk *clk_xtal; @@ -80,8 +81,9 @@ static int s3c2440_clk_add(struct sys_device *sysdev) s3c2440_clk_upll.rate = s3c2410_get_pll(upllcon, clk_xtal->rate); - printk("S3C2440: Clock Support, UPLL %ld.%03ld MHz\n", - print_mhz(s3c2440_clk_upll.rate)); + printk("S3C2440: Clock Support, UPLL %ld.%03ld MHz, DVS %s\n", + print_mhz(s3c2440_clk_upll.rate), + (camdivn & S3C2440_CAMDIVN_DVSEN) ? "on" : "off"); clk_p = clk_get(NULL, "pclk"); clk_h = clk_get(NULL, "hclk");