projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1bbb042
)
MLK-14425: clk-imx6sx: Check clk_on_imx6sx in imx_amp_power_init
author
Leonard Crestez
<leonard.crestez@nxp.com>
Fri, 10 Mar 2017 16:33:40 +0000
(18:33 +0200)
committer
Nitin Garg
<nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:10:54 +0000
(15:10 -0500)
This fixes crashing on boot on imx7d if imx_src_is_m4_enabled(). This
check was lost when porting
24ee04ce76d6a8d8229c642eb5d7a15ea57570c6
.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
drivers/clk/imx/clk-imx6sx.c
patch
|
blob
|
history
diff --git
a/drivers/clk/imx/clk-imx6sx.c
b/drivers/clk/imx/clk-imx6sx.c
index
60941ff
..
d9e9fa4
100644
(file)
--- a/
drivers/clk/imx/clk-imx6sx.c
+++ b/
drivers/clk/imx/clk-imx6sx.c
@@
-697,7
+697,7
@@
static int __init imx_amp_power_init(void)
int i;
void __iomem *shared_mem_base;
- if (!(imx_src_is_m4_enabled()))
+ if (!(imx_src_is_m4_enabled()
&& clk_on_imx6sx()
))
return 0;
amp_power_mutex = imx_sema4_mutex_create(0, MCC_POWER_SHMEM_NUMBER);