summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mu.c
diff options
context:
space:
mode:
authorBai Ping <b51503@freescale.com>2015-09-25 00:49:13 +0800
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:23:24 +0800
commitd35205a6fb07ce4d5b2dbd90c2b5c5522f25ad0f (patch)
tree518ec814e6918fbf52afaac2b84cd23fd379c49f /arch/arm/mach-imx/mu.c
parent6238f2ec30bd412a228b1326bf5c317de88a925b (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 'arch/arm/mach-imx/mu.c')
-rw-r--r--arch/arm/mach-imx/mu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mu.c b/arch/arm/mach-imx/mu.c
index 9c4fe025c763..898cfd0fa1b6 100644
--- a/arch/arm/mach-imx/mu.c
+++ b/arch/arm/mach-imx/mu.c
@@ -188,14 +188,18 @@ static void mu_work_handler(struct work_struct *work)
switch (m4_message) {
case MU_LPM_M4_REQUEST_HIGH_BUS:
request_bus_freq(BUS_FREQ_HIGH);
+#ifdef CONFIG_SOC_IMX6SX
imx6sx_set_m4_highfreq(true);
+#endif
imx_mu_send_message(MU_LPM_HANDSHAKE_INDEX,
MU_LPM_BUS_HIGH_READY_FOR_M4);
m4_freq_low = false;
break;
case MU_LPM_M4_RELEASE_HIGH_BUS:
release_bus_freq(BUS_FREQ_HIGH);
+#ifdef CONFIG_SOC_IMX6SX
imx6sx_set_m4_highfreq(false);
+#endif
imx_mu_send_message(MU_LPM_HANDSHAKE_INDEX,
MU_LPM_M4_FREQ_CHANGE_READY);
m4_freq_low = true;