aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx/s3c2410-clock.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-04-28 12:58:13 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-10 11:44:38 +0900
commit4e04691bc600b53f6aab63404e58fae3bdf8e310 (patch)
treee38f054ccb1ed1eb49315a2da15851009229c163 /arch/arm/plat-s3c24xx/s3c2410-clock.c
parentARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use (diff)
downloadlinux-dev-4e04691bc600b53f6aab63404e58fae3bdf8e310.tar.xz
linux-dev-4e04691bc600b53f6aab63404e58fae3bdf8e310.zip
ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage
Add s3c_disable_clocks() and change the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c2410-clock.c')
-rw-r--r--arch/arm/plat-s3c24xx/s3c2410-clock.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c2410-clock.c b/arch/arm/plat-s3c24xx/s3c2410-clock.c
index b61bdb793734..9ecc5d913679 100644
--- a/arch/arm/plat-s3c24xx/s3c2410-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c2410-clock.c
@@ -87,7 +87,7 @@ static int s3c2410_upll_enable(struct clk *clk, int enable)
/* standard clock definitions */
-static struct clk init_clocks_disable[] = {
+static struct clk init_clocks_off[] = {
{
.name = "nand",
.id = -1,
@@ -249,17 +249,8 @@ int __init s3c2410_baseclk_add(void)
/* install (and disable) the clocks we do not need immediately */
- clkp = init_clocks_disable;
- for (ptr = 0; ptr < ARRAY_SIZE(init_clocks_disable); ptr++, clkp++) {
-
- ret = s3c24xx_register_clock(clkp);
- if (ret < 0) {
- printk(KERN_ERR "Failed to register clock %s (%d)\n",
- clkp->name, ret);
- }
-
- s3c2410_clkcon_enable(clkp, 0);
- }
+ s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+ s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
/* show the clock-slow value */