Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 160873
b: refs/heads/master
c: c372a5c
h: refs/heads/master
i:
  160871: 1a91e75
v: v3
  • Loading branch information
Daniel Mack authored and Sascha Hauer committed Aug 14, 2009
1 parent bce5d4b commit b6101c2
Show file tree
Hide file tree
Showing 2 changed files with 8 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: cf87a6e2fe95891575c45ba1a0ecb8cf53c09732
refs/heads/master: c372a5cf4cde161c7f59bbe7a9ebcfce9cb2c2f8
7 changes: 7 additions & 0 deletions trunk/arch/arm/mach-mx3/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,11 @@ static unsigned long clk_ckih_get_rate(struct clk *clk)
return ckih_rate;
}

static unsigned long clk_ckil_get_rate(struct clk *clk)
{
return CKIL_CLK_FREQ;
}

static struct clk ckih_clk = {
.get_rate = clk_ckih_get_rate,
};
Expand Down Expand Up @@ -509,6 +514,7 @@ DEFINE_CLOCK(usb_clk1, 0, NULL, 0, usb_get_rate, NULL, &usb_pll_clk)
DEFINE_CLOCK(nfc_clk, 0, NULL, 0, nfc_get_rate, NULL, &ahb_clk);
DEFINE_CLOCK(scc_clk, 0, NULL, 0, NULL, NULL, &ipg_clk);
DEFINE_CLOCK(ipg_clk, 0, NULL, 0, ipg_get_rate, NULL, &ahb_clk);
DEFINE_CLOCK(ckil_clk, 0, NULL, 0, clk_ckil_get_rate, NULL, NULL);

#define _REGISTER_CLOCK(d, n, c) \
{ \
Expand Down Expand Up @@ -566,6 +572,7 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(NULL, "iim", iim_clk)
_REGISTER_CLOCK(NULL, "mpeg4", mpeg4_clk)
_REGISTER_CLOCK(NULL, "mbx", mbx_clk)
_REGISTER_CLOCK("mxc_rtc", NULL, ckil_clk)
};

int __init mx31_clocks_init(unsigned long fref)
Expand Down

0 comments on commit b6101c2

Please sign in to comment.