diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2015-01-06 17:28:28 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2015-02-02 14:58:21 +0800 |
| commit | 7ad070943645bfc7c6eec090eb034bb041f075d3 (patch) | |
| tree | f13c7cd9c82f17db719f847df31231c51a58dafb | |
| parent | e5dbeabb3e058680d2752ec2144dd411e321dc36 (diff) | |
MLK-10075: ARM: clk-imx6q: refine esai_ipg's parent
esai_ipg clock's parent is ahb, not ipg.
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit adfc94281c34877966bdb8e9641d106a7f74d8e5)
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index cda76a26ac8d..59cda8b89135 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2014 Freescale Semiconductor, Inc. + * Copyright 2011-2015 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. * * The code contained herein is licensed under the GNU General Public @@ -528,7 +528,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[epit1] = imx_clk_gate2("epit1", "ipg", base + 0x6c, 12); clk[epit2] = imx_clk_gate2("epit2", "ipg", base + 0x6c, 14); clk[esai_extal] = imx_clk_gate2_shared("esai_extal", "esai_podf", base + 0x6c, 16, &share_count_esai); - clk[esai_ipg] = imx_clk_gate2_shared("esai_ipg", "ipg", base + 0x6c, 16, &share_count_esai); + clk[esai_ipg] = imx_clk_gate2_shared("esai_ipg", "ahb", base + 0x6c, 16, &share_count_esai); clk[esai_mem] = imx_clk_gate2_shared("esai_mem", "ahb", base + 0x6c, 16, &share_count_esai); clk[gpt_ipg] = imx_clk_gate2("gpt_ipg", "ipg", base + 0x6c, 20); clk[gpt_ipg_per] = imx_clk_gate2("gpt_ipg_per", "ipg_per", base + 0x6c, 22); |