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 11:06:41 +0200 |
| commit | 376729ba03802d544231e954795f2b6b575bd0fa (patch) | |
| tree | e1c5e4b0b9e2e0bbfdf32c5be5d8a3c829e7c8ba | |
| parent | eef13e1787cb9fbab30f370c0b1437b50eb3a696 (diff) | |
ARM: imx: fix clock for i.MX 7 when Cortex-M4 is running
Commit 619c5719cf ("MLK-11566-7 ARM: imx: support single SOC config")
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 42b83b9baf98..5416a00dd061 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 fafff457d83e..c4fe1788a5e3 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 33095bdbc8af..57916e830109 100644 --- a/arch/arm/mach-imx/clk-pllv3.c +++ b/arch/arm/mach-imx/clk-pllv3.c @@ -128,6 +128,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); |