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-lpc18xx | |
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-lpc18xx')
-rw-r--r-- | kernel/arch/arm/mach-lpc18xx/Makefile | 1 | ||||
-rw-r--r-- | kernel/arch/arm/mach-lpc18xx/Makefile.boot | 3 | ||||
-rw-r--r-- | kernel/arch/arm/mach-lpc18xx/board-dt.c | 22 |
3 files changed, 26 insertions, 0 deletions
diff --git a/kernel/arch/arm/mach-lpc18xx/Makefile b/kernel/arch/arm/mach-lpc18xx/Makefile new file mode 100644 index 000000000..bd0b7b5d6 --- /dev/null +++ b/kernel/arch/arm/mach-lpc18xx/Makefile @@ -0,0 +1 @@ +obj-y += board-dt.o diff --git a/kernel/arch/arm/mach-lpc18xx/Makefile.boot b/kernel/arch/arm/mach-lpc18xx/Makefile.boot new file mode 100644 index 000000000..eacfc3f5c --- /dev/null +++ b/kernel/arch/arm/mach-lpc18xx/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-lpc18xx/board-dt.c b/kernel/arch/arm/mach-lpc18xx/board-dt.c new file mode 100644 index 000000000..fdcee78d1 --- /dev/null +++ b/kernel/arch/arm/mach-lpc18xx/board-dt.c @@ -0,0 +1,22 @@ +/* + * Device Tree board file for NXP LPC18xx/43xx + * + * Copyright (C) 2015 Joachim Eastwood <manabian@gmail.com> + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include <asm/mach/arch.h> + +static const char *const lpc18xx_43xx_compat[] __initconst = { + "nxp,lpc1850", + "nxp,lpc4350", + "nxp,lpc4370", + NULL +}; + +DT_MACHINE_START(LPC18XXDT, "NXP LPC18xx/43xx (Device Tree)") + .dt_compat = lpc18xx_43xx_compat, +MACHINE_END |