diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2018-05-10 01:50:34 +0200 |
---|---|---|
committer | Kevin Hilman <khilman@baylibre.com> | 2018-05-10 17:03:28 -0700 |
commit | 0633d20feab57796888a8f5d5d1649085648fae6 (patch) | |
tree | e1ca1aed03adf4c90f8bfd3f87c2143fd43e22c8 /arch/arm | |
parent | 15b520f132d18f7349763cbc591898c6c31ecd94 (diff) | |
download | linux-0633d20feab57796888a8f5d5d1649085648fae6.tar.gz linux-0633d20feab57796888a8f5d5d1649085648fae6.tar.bz2 linux-0633d20feab57796888a8f5d5d1649085648fae6.zip |
ARM: meson: add support for the Meson8m2 SoCs
Add the newly introduced compatible string for the Meson8m2 SoC.
The existing Meson8 Kconfig entry is updated to also provide support for
the Meson8m2 SoCs. The Meson8m2 SoC is mostly identical to the Meson8 SoC
with just a few peripherals being updated. Both SoCs currently
share the same pinctrl, clock and GPIO IRQ bindings. Thus the existing
Kconfig entry is re-used to avoid duplication (the only cost is building
a few extra DTBs).
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-meson/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-meson/meson.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index d90f61e6254f..2bc630471beb 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -19,7 +19,7 @@ config MACH_MESON6 select MESON6_TIMER config MACH_MESON8 - bool "Amlogic Meson8 SoCs support" + bool "Amlogic Meson8 and Meson8m2 SoCs support" default ARCH_MESON select MESON6_TIMER select COMMON_CLK_MESON8B diff --git a/arch/arm/mach-meson/meson.c b/arch/arm/mach-meson/meson.c index 4e2357178625..c8d99df32f9b 100644 --- a/arch/arm/mach-meson/meson.c +++ b/arch/arm/mach-meson/meson.c @@ -20,6 +20,7 @@ static const char * const meson_common_board_compat[] = { "amlogic,meson6", "amlogic,meson8", "amlogic,meson8b", + "amlogic,meson8m2", NULL, }; |