diff options
author | Huang Shijie <b32955@freescale.com> | 2013-05-17 05:15:23 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:00:37 -0400 |
commit | f845fbda63a598648fa486c3e7d5336d92a06c4f (patch) | |
tree | 6c2ad5bb545c1c737e14b3dd5a2d327fa90f3369 | |
parent | 53e5a354da98e060b235beac3d746bece756b8f8 (diff) |
ARM: imx6q: clk: add the eim_slow clock
Commit 9545b2ed68eef1541219d5c6351c10e698a24f39 upstream.
Add the eim_slow clock, since the weim needs it.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r-- | Documentation/devicetree/bindings/clock/imx6q-clock.txt | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt index 6deb6fd1c7cd..a0e104f0527e 100644 --- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt | |||
@@ -208,6 +208,7 @@ clocks and IDs. | |||
208 | pll4_post_div 193 | 208 | pll4_post_div 193 |
209 | pll5_post_div 194 | 209 | pll5_post_div 194 |
210 | pll5_video_div 195 | 210 | pll5_video_div 195 |
211 | eim_slow 196 | ||
211 | 212 | ||
212 | Examples: | 213 | Examples: |
213 | 214 | ||
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 79a118a2925d..3450592f7f3d 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c | |||
@@ -239,7 +239,7 @@ enum mx6q_clks { | |||
239 | pll4_audio, pll5_video, pll8_mlb, pll7_usb_host, pll6_enet, ssi1_ipg, | 239 | pll4_audio, pll5_video, pll8_mlb, pll7_usb_host, pll6_enet, ssi1_ipg, |
240 | ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5, | 240 | ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5, |
241 | sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate, | 241 | sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate, |
242 | usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, clk_max | 242 | usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, eim_slow, clk_max |
243 | }; | 243 | }; |
244 | 244 | ||
245 | static struct clk *clk[clk_max]; | 245 | static struct clk *clk[clk_max]; |
@@ -531,6 +531,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) | |||
531 | clk[usdhc2] = imx_clk_gate2("usdhc2", "usdhc2_podf", base + 0x80, 4); | 531 | clk[usdhc2] = imx_clk_gate2("usdhc2", "usdhc2_podf", base + 0x80, 4); |
532 | clk[usdhc3] = imx_clk_gate2("usdhc3", "usdhc3_podf", base + 0x80, 6); | 532 | clk[usdhc3] = imx_clk_gate2("usdhc3", "usdhc3_podf", base + 0x80, 6); |
533 | clk[usdhc4] = imx_clk_gate2("usdhc4", "usdhc4_podf", base + 0x80, 8); | 533 | clk[usdhc4] = imx_clk_gate2("usdhc4", "usdhc4_podf", base + 0x80, 8); |
534 | clk[eim_slow] = imx_clk_gate2("eim_slow", "emi_slow_podf", base + 0x80, 10); | ||
534 | clk[vdo_axi] = imx_clk_gate2("vdo_axi", "vdo_axi_sel", base + 0x80, 12); | 535 | clk[vdo_axi] = imx_clk_gate2("vdo_axi", "vdo_axi_sel", base + 0x80, 12); |
535 | clk[vpu_axi] = imx_clk_gate2("vpu_axi", "vpu_axi_podf", base + 0x80, 14); | 536 | clk[vpu_axi] = imx_clk_gate2("vpu_axi", "vpu_axi_podf", base + 0x80, 14); |
536 | clk[cko1] = imx_clk_gate("cko1", "cko1_podf", base + 0x60, 7); | 537 | clk[cko1] = imx_clk_gate("cko1", "cko1_podf", base + 0x60, 7); |