diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-07-18 13:46:15 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2016-07-18 13:46:15 -0700 |
| commit | df57a12e5bdaa0b5ab0ce0d8a9d50933835c4de8 (patch) | |
| tree | 35a3b51ceec36f1a45f6b31729e2fb03887bc047 /arch/arm/mach-imx/clk-gate2.c | |
| parent | eb479e52f9c6d32164ae76606fd7ce372f2aa153 (diff) | |
| parent | 77f61547834c4f127b44b13e43c59133a35880dc (diff) | |
Merge remote-tracking branch 'nxp/imx_4.1.15_1.0.0_ga' into toradex_imx_4.1.15_1.0.0_ga-next
Diffstat (limited to 'arch/arm/mach-imx/clk-gate2.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-gate2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-gate2.c b/arch/arm/mach-imx/clk-gate2.c index 275a62db8a9f..412efc4d7b30 100644 --- a/arch/arm/mach-imx/clk-gate2.c +++ b/arch/arm/mach-imx/clk-gate2.c @@ -19,6 +19,7 @@ #include <linux/string.h> #include "clk.h" #include "common.h" +#include "hardware.h" /** * DOC: basic gatable clock which can gate and ungate it's ouput @@ -58,7 +59,7 @@ static void clk_gate2_do_shared_clks(struct clk_hw *hw, bool enable) { struct clk_gate2 *gate = to_clk_gate2(hw); - if (imx_src_is_m4_enabled()) { + if (imx_src_is_m4_enabled() && cpu_is_imx6sx()) { #ifdef CONFIG_SOC_IMX6SX if (!amp_power_mutex || !shared_mem) { if (enable) |