diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/arm/mach-stm32 | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/arm/mach-stm32')
-rw-r--r-- | kernel/arch/arm/mach-stm32/Makefile | 1 | ||||
-rw-r--r-- | kernel/arch/arm/mach-stm32/Makefile.boot | 3 | ||||
-rw-r--r-- | kernel/arch/arm/mach-stm32/board-dt.c | 19 |
3 files changed, 23 insertions, 0 deletions
diff --git a/kernel/arch/arm/mach-stm32/Makefile b/kernel/arch/arm/mach-stm32/Makefile new file mode 100644 index 000000000..bd0b7b5d6 --- /dev/null +++ b/kernel/arch/arm/mach-stm32/Makefile @@ -0,0 +1 @@ +obj-y += board-dt.o diff --git a/kernel/arch/arm/mach-stm32/Makefile.boot b/kernel/arch/arm/mach-stm32/Makefile.boot new file mode 100644 index 000000000..eacfc3f5c --- /dev/null +++ b/kernel/arch/arm/mach-stm32/Makefile.boot @@ -0,0 +1,3 @@ +# Empty file waiting for deletion once Makefile.boot isn't needed any more. +# Patch waits for application at +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . diff --git a/kernel/arch/arm/mach-stm32/board-dt.c b/kernel/arch/arm/mach-stm32/board-dt.c new file mode 100644 index 000000000..f2ad7723d --- /dev/null +++ b/kernel/arch/arm/mach-stm32/board-dt.c @@ -0,0 +1,19 @@ +/* + * Copyright (C) Maxime Coquelin 2015 + * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> + * License terms: GNU General Public License (GPL), version 2 + */ + +#include <linux/kernel.h> +#include <asm/v7m.h> +#include <asm/mach/arch.h> + +static const char *const stm32_compat[] __initconst = { + "st,stm32f429", + NULL +}; + +DT_MACHINE_START(STM32DT, "STM32 (Device Tree Support)") + .dt_compat = stm32_compat, + .restart = armv7m_restart, +MACHINE_END |