diff options
author | Beniamino Galvani <b.galvani@gmail.com> | 2014-10-05 17:59:13 -0400 |
---|---|---|
committer | Carlo Caione <carlo@caione.org> | 2014-11-18 10:34:45 -0500 |
commit | e790af67b2f8579ab0c46b6e011111ce2200cfe3 (patch) | |
tree | 3fd4231f09f7a9549ac27a215887c096d5ee0013 | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
ARM: meson: add meson8 support
Add a MACH_MESON8 symbol and add "amlogic,meson8" to the list of
compatible strings for the Meson DT machine to support devices based
on the Meson8 family of SoCs.
Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Carlo Caione <carlo@caione.org>
-rw-r--r-- | arch/arm/mach-meson/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-meson/meson.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 2c1154e1794a..b289e8e1625f 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig | |||
@@ -10,4 +10,9 @@ config MACH_MESON6 | |||
10 | default ARCH_MESON | 10 | default ARCH_MESON |
11 | select MESON6_TIMER | 11 | select MESON6_TIMER |
12 | 12 | ||
13 | config MACH_MESON8 | ||
14 | bool "Amlogic Meson8 SoCs support" | ||
15 | default ARCH_MESON | ||
16 | select MESON6_TIMER | ||
17 | |||
13 | endif | 18 | endif |
diff --git a/arch/arm/mach-meson/meson.c b/arch/arm/mach-meson/meson.c index 5ee064f5a89f..8f42d8fbb505 100644 --- a/arch/arm/mach-meson/meson.c +++ b/arch/arm/mach-meson/meson.c | |||
@@ -16,12 +16,12 @@ | |||
16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
17 | #include <asm/mach/arch.h> | 17 | #include <asm/mach/arch.h> |
18 | 18 | ||
19 | static const char * const m6_common_board_compat[] = { | 19 | static const char * const meson_common_board_compat[] = { |
20 | "amlogic,meson6", | 20 | "amlogic,meson6", |
21 | "amlogic,meson8", | ||
21 | NULL, | 22 | NULL, |
22 | }; | 23 | }; |
23 | 24 | ||
24 | DT_MACHINE_START(AML8726_MX, "Amlogic Meson6 platform") | 25 | DT_MACHINE_START(MESON, "Amlogic Meson platform") |
25 | .dt_compat = m6_common_board_compat, | 26 | .dt_compat = meson_common_board_compat, |
26 | MACHINE_END | 27 | MACHINE_END |
27 | |||