Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373931
b: refs/heads/master
c: 5d530bb
h: refs/heads/master
i:
  373929: c489770
  373927: d890e9c
v: v3
  • Loading branch information
Sascha Hauer authored and Shawn Guo committed Apr 12, 2013
1 parent 8385232 commit 9b50abb
Show file tree
Hide file tree
Showing 3 changed files with 6 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: dc13ba2950acdd7ca64de3a8addcf85ada8ee908
refs/heads/master: 5d530bb0ad84d403d1aac79a8a8acf2c2b0a8dd7
2 changes: 2 additions & 0 deletions trunk/Documentation/devicetree/bindings/clock/imx5-clock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ clocks and IDs.
cko2_sel 168
cko2_podf 169
cko2 170
srtc_gate 171
pata_gate 172

Examples (for mx53):

Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-imx/clk-imx51-imx53.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ enum imx5_clks {
owire_gate, gpu3d_s, gpu2d_s, gpu3d_gate, gpu2d_gate, garb_gate,
cko1_sel, cko1_podf, cko1,
cko2_sel, cko2_podf, cko2,
srtc_gate, pata_gate,
clk_max
};

Expand Down Expand Up @@ -266,6 +267,8 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
clk[epit2_ipg_gate] = imx_clk_gate2("epit2_ipg_gate", "ipg", MXC_CCM_CCGR2, 6);
clk[epit2_hf_gate] = imx_clk_gate2("epit2_hf_gate", "per_root", MXC_CCM_CCGR2, 8);
clk[owire_gate] = imx_clk_gate2("owire_gate", "per_root", MXC_CCM_CCGR2, 22);
clk[srtc_gate] = imx_clk_gate2("srtc_gate", "per_root", MXC_CCM_CCGR4, 28);
clk[pata_gate] = imx_clk_gate2("pata_gate", "ipg", MXC_CCM_CCGR4, 0);

for (i = 0; i < ARRAY_SIZE(clk); i++)
if (IS_ERR(clk[i]))
Expand Down

0 comments on commit 9b50abb

Please sign in to comment.