diff options
| author | Octavian Purdila <octavian.purdila@nxp.com> | 2017-03-13 13:15:34 +0200 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-08 21:00:47 +0800 |
| commit | 23d0be4f8639f3bf12336c51402a117ec5cbaa13 (patch) | |
| tree | ae9f67563907889fcef0b2aac99ce828f9698f18 /arch/arm/mach-imx | |
| parent | 8d499d8710200aab18fc96f3e93332b4102c5d49 (diff) | |
MLK-14424 ARM: imx: fix PM CCM init on imx6sll
Since we share the same machine code for both imx6sll and imx6sl we
need to check the CPU in order to select the right device tree
binding for the PM CCM.
Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6sl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index e4a0e06da737..58e5033c4b18 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c @@ -77,7 +77,10 @@ static void __init imx6sl_init_irq(void) imx_init_l2cache(); imx_src_init(); irqchip_init(); - imx6_pm_ccm_init("fsl,imx6sl-ccm"); + if (cpu_is_imx6sll()) + imx6_pm_ccm_init("fsl,imx6sll-ccm"); + else + imx6_pm_ccm_init("fsl,imx6sl-ccm"); } static void __init imx6sl_map_io(void) |