From 3c97f713f2b69bd5beca0e99f16febe1bc96911e Mon Sep 17 00:00:00 2001 From: Jongpill Lee Date: Wed, 18 Aug 2010 22:33:43 +0900 Subject: [PATCH] --- yaml --- r: 221059 b: refs/heads/master c: 37e017292f56f3d39fb497d7fc9038967095e230 h: refs/heads/master i: 221057: aaf157bb6ad3ef81add2eb2baf57d6587825beaf 221055: d49e8b6eacf4ea6fa8abbef120399fdd5eb9ae55 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv310/clock.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e25fbdf0fc21..cbdd6ce70480 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 228ef9872b5c7e6fdb67a7a04547b33284242940 +refs/heads/master: 37e017292f56f3d39fb497d7fc9038967095e230 diff --git a/trunk/arch/arm/mach-s5pv310/clock.c b/trunk/arch/arm/mach-s5pv310/clock.c index 2c9424f9dfad..a0bcd9f3bb8f 100644 --- a/trunk/arch/arm/mach-s5pv310/clock.c +++ b/trunk/arch/arm/mach-s5pv310/clock.c @@ -46,6 +46,11 @@ static struct clk clk_sclk_usbphy1 = { .id = -1, }; +static int s5pv310_clksrc_mask_top_ctrl(struct clk *clk, int enable) +{ + return s5p_gatectrl(S5P_CLKSRC_MASK_TOP, clk, enable); +} + static int s5pv310_clksrc_mask_peril0_ctrl(struct clk *clk, int enable) { return s5p_gatectrl(S5P_CLKSRC_MASK_PERIL0, clk, enable); @@ -298,6 +303,8 @@ static struct clksrc_clk clk_vpllsrc = { .clk = { .name = "vpll_src", .id = -1, + .enable = s5pv310_clksrc_mask_top_ctrl, + .ctrlbit = (1 << 0), }, .sources = &clkset_vpllsrc, .reg_src = { .reg = S5P_CLKSRC_TOP1, .shift = 0, .size = 1 },