Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274053
b: refs/heads/master
c: 4a43c66
h: refs/heads/master
i:
  274051: 133c635
v: v3
  • Loading branch information
Heiko Stuebner authored and Kukjin Kim committed Oct 4, 2011
1 parent be4617b commit 66641af
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bd95be618b2c7ee9066d82cb729c7fbbab102c93
refs/heads/master: 4a43c666129f67b5bcc79fa59edb48c39fea75a0
28 changes: 28 additions & 0 deletions trunk/arch/arm/mach-s3c2416/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,32 @@ static unsigned int armdiv[8] = {
[7] = 8,
};

static struct clksrc_clk hsspi_eplldiv = {
.clk = {
.name = "hsspi-eplldiv",
.parent = &clk_esysclk.clk,
.ctrlbit = (1 << 14),
.enable = s3c2443_clkcon_enable_s,
},
.reg_div = { .reg = S3C2443_CLKDIV1, .size = 2, .shift = 24 },
};

static struct clk *hsspi_sources[] = {
[0] = &hsspi_eplldiv.clk,
[1] = NULL, /* to fix */
};

static struct clksrc_clk hsspi_mux = {
.clk = {
.name = "hsspi-if",
},
.sources = &(struct clksrc_sources) {
.sources = hsspi_sources,
.nr_sources = ARRAY_SIZE(hsspi_sources),
},
.reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 18 },
};

static struct clksrc_clk hsmmc_div[] = {
[0] = {
.clk = {
Expand Down Expand Up @@ -114,6 +140,8 @@ void __init_or_cpufreq s3c2416_setup_clocks(void)


static struct clksrc_clk *clksrcs[] __initdata = {
&hsspi_eplldiv,
&hsspi_mux,
&hsmmc_div[0],
&hsmmc_div[1],
&hsmmc_mux[0],
Expand Down

0 comments on commit 66641af

Please sign in to comment.