aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 05:25:08 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-04-12 07:28:15 -0400
commit5d530bb0ad84d403d1aac79a8a8acf2c2b0a8dd7 (patch)
tree1d3529a76ca9dc9bf5250fd146ebbb64dcfbe963
parentdc13ba2950acdd7ca64de3a8addcf85ada8ee908 (diff)
ARM: i.MX5: Add PATA and SRTC clocks
This adds the clock gates and the binding documentation for PATA and SRTC. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/clock/imx5-clock.txt2
-rw-r--r--arch/arm/mach-imx/clk-imx51-imx53.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx5-clock.txt b/Documentation/devicetree/bindings/clock/imx5-clock.txt
index 838ab8801e93..84cae1f187ca 100644
--- a/Documentation/devicetree/bindings/clock/imx5-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx5-clock.txt
@@ -183,6 +183,8 @@ clocks and IDs.
183 cko2_sel 168 183 cko2_sel 168
184 cko2_podf 169 184 cko2_podf 169
185 cko2 170 185 cko2 170
186 srtc_gate 171
187 pata_gate 172
186 188
187Examples (for mx53): 189Examples (for mx53):
188 190
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index a163e0e365dc..efbccc0dcada 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -110,6 +110,7 @@ enum imx5_clks {
110 owire_gate, gpu3d_s, gpu2d_s, gpu3d_gate, gpu2d_gate, garb_gate, 110 owire_gate, gpu3d_s, gpu2d_s, gpu3d_gate, gpu2d_gate, garb_gate,
111 cko1_sel, cko1_podf, cko1, 111 cko1_sel, cko1_podf, cko1,
112 cko2_sel, cko2_podf, cko2, 112 cko2_sel, cko2_podf, cko2,
113 srtc_gate, pata_gate,
113 clk_max 114 clk_max
114}; 115};
115 116
@@ -266,6 +267,8 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
266 clk[epit2_ipg_gate] = imx_clk_gate2("epit2_ipg_gate", "ipg", MXC_CCM_CCGR2, 6); 267 clk[epit2_ipg_gate] = imx_clk_gate2("epit2_ipg_gate", "ipg", MXC_CCM_CCGR2, 6);
267 clk[epit2_hf_gate] = imx_clk_gate2("epit2_hf_gate", "per_root", MXC_CCM_CCGR2, 8); 268 clk[epit2_hf_gate] = imx_clk_gate2("epit2_hf_gate", "per_root", MXC_CCM_CCGR2, 8);
268 clk[owire_gate] = imx_clk_gate2("owire_gate", "per_root", MXC_CCM_CCGR2, 22); 269 clk[owire_gate] = imx_clk_gate2("owire_gate", "per_root", MXC_CCM_CCGR2, 22);
270 clk[srtc_gate] = imx_clk_gate2("srtc_gate", "per_root", MXC_CCM_CCGR4, 28);
271 clk[pata_gate] = imx_clk_gate2("pata_gate", "ipg", MXC_CCM_CCGR4, 0);
269 272
270 for (i = 0; i < ARRAY_SIZE(clk); i++) 273 for (i = 0; i < ARRAY_SIZE(clk); i++)
271 if (IS_ERR(clk[i])) 274 if (IS_ERR(clk[i]))