Unverified Commit 183fc834 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-5.18' of... 

Merge tag 'imx-soc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC update for 5.18:

- Add initial support for i.MXRT10xx family which features NXP's
  implementation of the Arm Cortex-M7 core and in some case the
  Arm Cortex-M4 core too.

* tag 'imx-soc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Add initial support for i.MXRT10xx family

Link: https://lore.kernel.org/r/20220222075226.160187-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 543f7961 ed2e8e0a

arch/arm/mach-imx/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -227,6 +227,13 @@ config SOC_IMX7ULP 
	help

	  This enables support for Freescale i.MX7 Ultra Low Power processor.



config SOC_IMXRT

	bool "i.MXRT support"

	depends on ARM_SINGLE_ARMV7M

	select ARMV7M_SYSTICK if ARM_SINGLE_ARMV7M

	help

	  This enables support for Freescale i.MXRT Crossover processor.



config SOC_VF610

	bool "Vybrid Family VF610 support"

	select ARM_GIC if ARCH_MULTI_V7

arch/arm/mach-imx/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ obj-$(CONFIG_SOC_IMX50) += mach-imx50.o 
obj-$(CONFIG_SOC_IMX51) += mach-imx51.o

obj-$(CONFIG_SOC_IMX53) += mach-imx53.o



obj-$(CONFIG_SOC_IMXRT) += mach-imxrt.o



obj-$(CONFIG_SOC_VF610) += mach-vf610.o



obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2019

 * Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>

 */



#include <linux/kernel.h>

#include <asm/mach/arch.h>

#include <asm/v7m.h>



static const char *const imxrt_compat[] __initconst = {

	"fsl,imxrt1050",

	NULL

};



DT_MACHINE_START(IMXRTDT, "IMXRT (Device Tree Support)")

	.dt_compat = imxrt_compat,

	.restart = armv7m_restart,

MACHINE_END