Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022d0716 authored by Frank Li's avatar Frank Li Committed by Shawn Guo
Browse files

ARM: imx: add i.mx6ul msl support 



i.MX6UL is a new SOC, add MSL support

Signed-off-by: default avatarFrank Li <Frank.Li@freescale.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent d770e558

arch/arm/mach-imx/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -548,6 +548,14 @@ config SOC_IMX6SX 
	help

	  This enables support for Freescale i.MX6 SoloX processor.



config SOC_IMX6UL

	bool "i.MX6 UltraLite support"

	select PINCTRL_IMX6UL

	select SOC_IMX6



	help

	  This enables support for Freescale i.MX6 UltraLite processor.



config SOC_IMX7D

	bool "i.MX7 Dual support"

	select PINCTRL_IMX7D

arch/arm/mach-imx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ endif 
obj-$(CONFIG_SOC_IMX6Q) += mach-imx6q.o

obj-$(CONFIG_SOC_IMX6SL) += mach-imx6sl.o

obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o

obj-$(CONFIG_SOC_IMX6UL) += mach-imx6ul.o

obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o



ifeq ($(CONFIG_SUSPEND),y)

arch/arm/mach-imx/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ struct device * __init imx_soc_device_init(void) 
	case MXC_CPU_IMX6Q:

		soc_id = "i.MX6Q";

		break;

	case MXC_CPU_IMX6UL:

		soc_id = "i.MX6UL";

		break;

	case MXC_CPU_IMX7D:

		soc_id = "i.MX7D";

		break;

arch/arm/mach-imx/mach-imx6ul.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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

 * published by the Free Software Foundation.

 */

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include "common.h"



static void __init imx6ul_init_machine(void)

{

	struct device *parent;



	parent = imx_soc_device_init();

	if (parent == NULL)

		pr_warn("failed to initialize soc device\n");



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	imx_anatop_init();

}



static void __init imx6ul_init_irq(void)

{

	imx_init_revision_from_anatop();

	imx_src_init();

	irqchip_init();

}



static const char *imx6ul_dt_compat[] __initconst = {

	"fsl,imx6ul",

	NULL,

};



DT_MACHINE_START(IMX6UL, "Freescale i.MX6 Ultralite (Device Tree)")

	.init_irq	= imx6ul_init_irq,

	.init_machine	= imx6ul_init_machine,

	.dt_compat	= imx6ul_dt_compat,

MACHINE_END

arch/arm/mach-imx/mxc.h

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define MXC_CPU_IMX6DL		0x61

#define MXC_CPU_IMX6SX		0x62

#define MXC_CPU_IMX6Q		0x63

#define MXC_CPU_IMX6UL		0x64

#define MXC_CPU_IMX7D		0x72



#define IMX_DDR_TYPE_LPDDR2		1
@@ -165,6 +166,11 @@ static inline bool cpu_is_imx6sx(void) 
	return __mxc_cpu_type == MXC_CPU_IMX6SX;

}



static inline bool cpu_is_imx6ul(void)

{

	return __mxc_cpu_type == MXC_CPU_IMX6UL;

}



static inline bool cpu_is_imx6q(void)

{

	return __mxc_cpu_type == MXC_CPU_IMX6Q;