Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210111
b: refs/heads/master
c: 3ff3102
h: refs/heads/master
i:
  210109: 5f5cc34
  210107: 7faa31d
  210103: a02a34b
  210095: 7fe8523
  210079: 62a9f2e
  210047: 6461ab6
v: v3
  • Loading branch information
Jongpill Lee authored and Kukjin Kim committed Aug 27, 2010
1 parent e7986c9 commit 9551e73
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4d235f7934ab55329a5cb34d7e3949ba50b511d4
refs/heads/master: 3ff310206db33e66c076b1f656e70e9080f5be50
15 changes: 12 additions & 3 deletions trunk/arch/arm/mach-s5pv310/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ static struct clksrc_clk clk_mout_apll = {
},
.sources = &clk_src_apll,
.reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 },
};

static struct clksrc_clk clk_sclk_apll = {
.clk = {
.name = "sclk_apll",
.id = -1,
.parent = &clk_mout_apll.clk,
},
.reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 },
};

Expand All @@ -61,7 +69,7 @@ static struct clksrc_clk clk_mout_mpll = {
};

static struct clk *clkset_moutcore_list[] = {
[0] = &clk_mout_apll.clk,
[0] = &clk_sclk_apll.clk,
[1] = &clk_mout_mpll.clk,
};

Expand Down Expand Up @@ -154,7 +162,7 @@ static struct clksrc_clk clk_pclk_dbg = {

static struct clk *clkset_corebus_list[] = {
[0] = &clk_mout_mpll.clk,
[1] = &clk_mout_apll.clk,
[1] = &clk_sclk_apll.clk,
};

static struct clksrc_sources clkset_mout_corebus = {
Expand Down Expand Up @@ -220,7 +228,7 @@ static struct clksrc_clk clk_pclk_acp = {

static struct clk *clkset_aclk_top_list[] = {
[0] = &clk_mout_mpll.clk,
[1] = &clk_mout_apll.clk,
[1] = &clk_sclk_apll.clk,
};

static struct clksrc_sources clkset_aclk_200 = {
Expand Down Expand Up @@ -411,6 +419,7 @@ static struct clksrc_clk clksrcs[] = {
/* Clock initialization code */
static struct clksrc_clk *sysclks[] = {
&clk_mout_apll,
&clk_sclk_apll,
&clk_mout_epll,
&clk_mout_mpll,
&clk_moutcore,
Expand Down

0 comments on commit 9551e73

Please sign in to comment.