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-meson | |
| 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-meson')
| -rw-r--r-- | kernel/arch/arm/mach-meson/Kconfig | 5 | ||||
| -rw-r--r-- | kernel/arch/arm/mach-meson/meson.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kernel/arch/arm/mach-meson/Kconfig b/kernel/arch/arm/mach-meson/Kconfig index 0743e2059..5d56f86ae 100644 --- a/kernel/arch/arm/mach-meson/Kconfig +++ b/kernel/arch/arm/mach-meson/Kconfig @@ -19,4 +19,9 @@ config MACH_MESON8 default ARCH_MESON select MESON6_TIMER +config MACH_MESON8B + bool "Amlogic Meson8b SoCs support" + default ARCH_MESON + select MESON6_TIMER + endif diff --git a/kernel/arch/arm/mach-meson/meson.c b/kernel/arch/arm/mach-meson/meson.c index 5d6affe6a..4e2357178 100644 --- a/kernel/arch/arm/mach-meson/meson.c +++ b/kernel/arch/arm/mach-meson/meson.c @@ -19,6 +19,7 @@ static const char * const meson_common_board_compat[] = { "amlogic,meson6", "amlogic,meson8", + "amlogic,meson8b", NULL, }; |