aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/arm/mach-imx/mach-imx6sl.c
diff options
context:
space:
mode:
authorBai Ping <ping.bai@nxp.com>2018-03-08 17:34:55 +0800
committerShawn Guo <shawnguo@kernel.org>2018-03-09 09:22:06 +0800
commitdee5dee2a5b285d20f55a4758d3a51349691eeea (patch)
treed460562065c0942ea3b58e1f8e9802375722d3a1 /arch/arm/mach-imx/mach-imx6sl.c
parentARM: imx: pm-imx6: Return the error directly (diff)
downloadwireguard-linux-dee5dee2a5b285d20f55a4758d3a51349691eeea.tar.xz
wireguard-linux-dee5dee2a5b285d20f55a4758d3a51349691eeea.zip
ARM: imx: Add basic msl support for imx6sll
Add basic MSL support for i.MX6SLL. The i.MX 6SoloLiteLite application processors are NXP's latest additions to a growing family of multimedia-focused products offering high-performance processing optimized for lowest power consumption. The i.MX 6SoloLiteLite processors feature NXP's advanced implementation of the ARM Cortex-A9 core, which can be interfaced with LPDDR3 and LPDDR2 DRAM memory devices. Signed-off-by: Bai Ping <ping.bai@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6sl.c')
-rw-r--r--arch/arm/mach-imx/mach-imx6sl.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index 04084900d810..c7a1ef180dda 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -18,6 +18,7 @@
#include "common.h"
#include "cpuidle.h"
+#include "hardware.h"
static void __init imx6sl_fec_init(void)
{
@@ -54,7 +55,8 @@ static void __init imx6sl_init_machine(void)
of_platform_default_populate(NULL, NULL, parent);
- imx6sl_fec_init();
+ if (cpu_is_imx6sl())
+ imx6sl_fec_init();
imx_anatop_init();
imx6sl_pm_init();
}
@@ -66,11 +68,15 @@ 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_imx6sl())
+ imx6_pm_ccm_init("fsl,imx6sl-ccm");
+ else
+ imx6_pm_ccm_init("fsl,imx6sll-ccm");
}
static const char * const imx6sl_dt_compat[] __initconst = {
"fsl,imx6sl",
+ "fsl,imx6sll",
NULL,
};