Merge tag 'v3.19-meson-soc' of https://github.com/carlocaione/linux-meson into next/soc
Pull "ARM: meson: SOC related changes" from Carlo Caione: This is the pull request for the SoC related changes for the 3.19. The support for Meson8 is added together with L2 cache management. * tag 'v3.19-meson-soc' of https://github.com/carlocaione/linux-meson: clocksource: meson6: Select CLKSRC_MMIO ARM: meson: enable L2 cache ARM: meson: document meson8 compatible properties ARM: meson: add meson8 support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
f2f456e720
|
@ -2,7 +2,9 @@ Amlogic MesonX device tree bindings
|
|||
-------------------------------------------
|
||||
|
||||
Boards with the Amlogic Meson6 SoC shall have the following properties:
|
||||
Required root node property:
|
||||
compatible: "amlogic,meson6"
|
||||
|
||||
Required root node property:
|
||||
|
||||
compatible = "amlogic,meson6";
|
||||
Boards with the Amlogic Meson8 SoC shall have the following properties:
|
||||
Required root node property:
|
||||
compatible: "amlogic,meson8";
|
||||
|
|
|
@ -2,6 +2,7 @@ menuconfig ARCH_MESON
|
|||
bool "Amlogic Meson SoCs" if ARCH_MULTI_V7
|
||||
select GENERIC_IRQ_CHIP
|
||||
select ARM_GIC
|
||||
select CACHE_L2X0
|
||||
|
||||
if ARCH_MESON
|
||||
|
||||
|
@ -10,4 +11,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
|
||||
|
|
|
@ -16,12 +16,14 @@
|
|||
#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,
|
||||
.l2c_aux_val = 0,
|
||||
.l2c_aux_mask = ~0,
|
||||
MACHINE_END
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@ config ARMADA_370_XP_TIMER
|
|||
|
||||
config MESON6_TIMER
|
||||
bool
|
||||
select CLKSRC_MMIO
|
||||
|
||||
config ORION_TIMER
|
||||
select CLKSRC_OF
|
||||
|
|
Loading…
Reference in a new issue