aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorIain Paton <ipaton0@gmail.com>2014-04-16 14:33:24 -0400
committerShawn Guo <shawn.guo@freescale.com>2014-05-12 10:58:46 -0400
commitee3387f97bea00f99add9efe2d2b29374a49af41 (patch)
tree9b9e7daa1ea5466ed814733a6231364494d58f0d /arch/arm/mach-imx
parent4fcad49245ed7f62f2ad2a3bd238eaac227d3f56 (diff)
ARM: imx6: clk: i.MX6 DualLite/Solo i2c4 clock
Compared to i.MX6 Quad/Dual the CCM_CCGR1 register in the i.MX6 Solo/DualLite replaces the ecspi5 clock with the i2c4 clock. Handle this difference using cpu_is_imx6dl(). Signed-off-by: Iain Paton <ipaton0@gmail.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/clk-imx6q.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index d44d7c376492..8440878fec69 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -352,7 +352,11 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
352 clk[ecspi2] = imx_clk_gate2("ecspi2", "ecspi_root", base + 0x6c, 2); 352 clk[ecspi2] = imx_clk_gate2("ecspi2", "ecspi_root", base + 0x6c, 2);
353 clk[ecspi3] = imx_clk_gate2("ecspi3", "ecspi_root", base + 0x6c, 4); 353 clk[ecspi3] = imx_clk_gate2("ecspi3", "ecspi_root", base + 0x6c, 4);
354 clk[ecspi4] = imx_clk_gate2("ecspi4", "ecspi_root", base + 0x6c, 6); 354 clk[ecspi4] = imx_clk_gate2("ecspi4", "ecspi_root", base + 0x6c, 6);
355 clk[ecspi5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8); 355 if (cpu_is_imx6dl())
356 /* ecspi5 is replaced with i2c4 on imx6dl & imx6s */
357 clk[ecspi5] = imx_clk_gate2("i2c4", "ipg_per", base + 0x6c, 8);
358 else
359 clk[ecspi5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8);
356 clk[enet] = imx_clk_gate2("enet", "ipg", base + 0x6c, 10); 360 clk[enet] = imx_clk_gate2("enet", "ipg", base + 0x6c, 10);
357 clk[esai] = imx_clk_gate2("esai", "esai_podf", base + 0x6c, 16); 361 clk[esai] = imx_clk_gate2("esai", "esai_podf", base + 0x6c, 16);
358 clk[gpt_ipg] = imx_clk_gate2("gpt_ipg", "ipg", base + 0x6c, 20); 362 clk[gpt_ipg] = imx_clk_gate2("gpt_ipg", "ipg", base + 0x6c, 20);