diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-05-03 14:27:48 -0700 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:09:51 +0100 |
| commit | bcdfec99c4d8aee54a5bc1ea706f0fcf4f48523d (patch) | |
| tree | 1f95cffe99028cad4df9f9933567f189857454ef /arch/arm/mach-imx | |
| parent | bf37100e154e248fbbb0cf6f2f4bcd75e98bf302 (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>
(cherry picked from commit 7b20ca6cdb752ac4770c2c11e9500b7c1d8bc395)
Diffstat (limited to 'arch/arm/mach-imx')
| -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 71624b14f4f7..412efc4d7b30 100644 --- a/arch/arm/mach-imx/clk-gate2.c +++ b/arch/arm/mach-imx/clk-gate2.c @@ -82,6 +82,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 5eeed8bc47c4..ad8ba14e698c 100644 --- a/arch/arm/mach-imx/clk-pfd.c +++ b/arch/arm/mach-imx/clk-pfd.c @@ -77,6 +77,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 25963d77a9a0..600caf4d0322 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); |