diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-05-03 14:27:48 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-06-24 14:46:24 +0200 |
| commit | 7b20ca6cdb752ac4770c2c11e9500b7c1d8bc395 (patch) | |
| tree | 13a88d417f2cc6f29c6e9183ac75276f9fc2b787 | |
| parent | ac23876a1c36a702019c44f299195afa7b875393 (diff) | |
ARM: imx: fix clock for i.MX 7 when Cortex-M4 is running
Commit b0149f1c7c ("MLK-11620 ARM: imx: single SOC config/compile
support") ifdef'd clock functionality for SoloX only if Cortex-M4 is
running. However, i.MX 7 also provides a Cortex-M4, hence the true
branch in those if statements have been taken. Since the whole block
was ifdef'd, the functions were rendered useless for i.MX 7. Fix this
by just doing the same thing as if Cortex-M4 is not running.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | arch/arm/mach-imx/clk-gate2.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-pfd.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-pllv3.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clk-gate2.c b/arch/arm/mach-imx/clk-gate2.c index 235a273e83bb..275a62db8a9f 100644 --- a/arch/arm/mach-imx/clk-gate2.c +++ b/arch/arm/mach-imx/clk-gate2.c @@ -81,6 +81,8 @@ static void clk_gate2_do_shared_clks(struct clk_hw *hw, bool enable) clk_gate2_do_hardware(gate, enable); imx_sema4_mutex_unlock(amp_power_mutex); +#else + clk_gate2_do_hardware(gate, enable); #endif } else { clk_gate2_do_hardware(gate, enable); diff --git a/arch/arm/mach-imx/clk-pfd.c b/arch/arm/mach-imx/clk-pfd.c index fbd56c68aa4c..92d293416f89 100644 --- a/arch/arm/mach-imx/clk-pfd.c +++ b/arch/arm/mach-imx/clk-pfd.c @@ -76,6 +76,8 @@ static void clk_pfd_do_shared_clks(struct clk_hw *hw, bool enable) clk_pfd_do_hardware(pfd, enable); imx_sema4_mutex_unlock(amp_power_mutex); +#else + clk_pfd_do_hardware(pfd, enable); #endif } else { clk_pfd_do_hardware(pfd, enable); diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c index 63ee223389cb..cf7d748556dc 100644 --- a/arch/arm/mach-imx/clk-pllv3.c +++ b/arch/arm/mach-imx/clk-pllv3.c @@ -130,6 +130,8 @@ static void clk_pllv3_do_shared_clks(struct clk_hw *hw, bool enable) clk_pllv3_do_hardware(hw, enable); imx_sema4_mutex_unlock(amp_power_mutex); +#else + clk_pllv3_do_hardware(hw, enable); #endif } else { clk_pllv3_do_hardware(hw, enable); |