diff options
| author | Bai Ping <b51503@freescale.com> | 2015-09-25 00:49:13 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:20:42 +0300 |
| commit | 0b8a6971ced6489ebda85c3b82c621a7c3900cec (patch) | |
| tree | 18430e2d86943bfa623de7beab226cce9e19571d /drivers/clk/imx/clk-gate2.c | |
| parent | 3fc1b71afd1b9c09f20d2858f7c80e1679544e82 (diff) | |
MLK-11620 ARM: imx: single SOC config/compile support
Currently, all i.MX6 config (CONFIG_SOC_IMX6XXX) are enabled, so
build and function are OK for every i.MX6 SOC, however, when only
one SOC config is selected in menu config, for example, users only
needs i.MX6SL, they might deselect all reset SOC configs, then the
build will fail, this is unacceptable.
Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Bai Ping <b51503@freescale.com>
Diffstat (limited to 'drivers/clk/imx/clk-gate2.c')
| -rw-r--r-- | drivers/clk/imx/clk-gate2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c index 43f2129993c9..effcd482b82c 100644 --- a/drivers/clk/imx/clk-gate2.c +++ b/drivers/clk/imx/clk-gate2.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2010-2011 Canonical Ltd <jeremy.kerr@canonical.com> * Copyright (C) 2011-2012 Mike Turquette, Linaro Ltd <mturquette@linaro.org> - * Copyright (C) 2014 Freescale Semiconductor, Inc. + * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -60,6 +60,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()) { +#ifdef CONFIG_SOC_IMX6SX if (!amp_power_mutex || !shared_mem) { if (enable) clk_gate2_do_hardware(gate, enable); @@ -81,6 +82,7 @@ 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); +#endif } else { clk_gate2_do_hardware(gate, enable); } |