aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-meson
diff options
context:
space:
mode:
authorBeniamino Galvani <b.galvani@gmail.com>2014-10-05 23:59:13 +0200
committerCarlo Caione <carlo@caione.org>2014-11-18 16:34:45 +0100
commite790af67b2f8579ab0c46b6e011111ce2200cfe3 (patch)
tree3fd4231f09f7a9549ac27a215887c096d5ee0013 /arch/arm/mach-meson
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadlinux-linaro-stable-e790af67b2f8579ab0c46b6e011111ce2200cfe3.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-meson')
-rw-r--r--arch/arm/mach-meson/Kconfig5
-rw-r--r--arch/arm/mach-meson/meson.c8
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
default ARCH_MESON
select MESON6_TIMER
+config MACH_MESON8
+ bool "Amlogic Meson8 SoCs support"
+ default ARCH_MESON
+ select MESON6_TIMER
+
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 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
-static const char * const m6_common_board_compat[] = {
+static const char * const meson_common_board_compat[] = {
"amlogic,meson6",
+ "amlogic,meson8",
NULL,
};
-DT_MACHINE_START(AML8726_MX, "Amlogic Meson6 platform")
- .dt_compat = m6_common_board_compat,
+DT_MACHINE_START(MESON, "Amlogic Meson platform")
+ .dt_compat = meson_common_board_compat,
MACHINE_END
-