diff options
| author | Iain Paton <ipaton0@gmail.com> | 2014-04-16 19:33:24 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-04-23 18:51:16 +0200 |
| commit | b8d736e9e6019d8886705047334ff1e056c7cdff (patch) | |
| tree | 7448f9e210039002779ffe3418319caf5b1592b9 | |
| parent | a700491ac9cc18d27ddfadee3a7787039485ed40 (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>
(cherry picked from commit ee3387f97bea00f99add9efe2d2b29374a49af41)
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 6 |
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 e09b1e8e78ac..19f31c4d32af 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -474,7 +474,11 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) clk[ecspi2] = imx_clk_gate2("ecspi2", "ecspi_root", base + 0x6c, 2); clk[ecspi3] = imx_clk_gate2("ecspi3", "ecspi_root", base + 0x6c, 4); clk[ecspi4] = imx_clk_gate2("ecspi4", "ecspi_root", base + 0x6c, 6); - clk[ecspi5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8); + if (cpu_is_imx6dl()) + /* ecspi5 is replaced with i2c4 on imx6dl & imx6s */ + clk[ecspi5] = imx_clk_gate2("i2c4", "ipg_per", base + 0x6c, 8); + else + clk[ecspi5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8); clk[enet] = imx_clk_gate2("enet", "ipg", base + 0x6c, 10); clk[epit1] = imx_clk_gate2("epit1", "ipg", base + 0x6c, 12); clk[epit2] = imx_clk_gate2("epit2", "ipg", base + 0x6c, 14); |