diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-05-03 14:27:48 -0700 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-12-24 01:27:21 +0100 |
| commit | 55a39e919fdc8a0daf3d44819c0559a1eb8fcd8e (patch) | |
| tree | 535a9b9935583fce1a22ac006052da6ba8db5473 | |
| parent | b1780786b82503f13cd7c0a45c4b51a4cf7dede9 (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)
(cherry picked from commit bcdfec99c4d8aee54a5bc1ea706f0fcf4f48523d)
| -rw-r--r-- | drivers/clk/imx/clk-gate2.c | 2 | ||||
| -rw-r--r-- | drivers/clk/imx/clk-pfd.c | 2 | ||||
| -rw-r--r-- | drivers/clk/imx/clk-pllv3.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c index b9bd5938d44a..b4a3d4a6e924 100644 --- a/drivers/clk/imx/clk-gate2.c +++ b/drivers/clk/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/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c index e29bd792522f..7bbae0c38178 100644 --- a/drivers/clk/imx/clk-pfd.c +++ b/drivers/clk/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/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index d8b481936f20..7cf1df9c19cd 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/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); |