Skip to content

Commit

Permalink
ARM: meson: add basic support for MesonX SoCs
Browse files Browse the repository at this point in the history
This patch adds the basic machine file for the MesonX SoCs. Only Meson6
is populated.

Signed-off-by: Carlo Caione <carlo@caione.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Carlo Caione authored and Arnd Bergmann committed Sep 25, 2014
1 parent d8a0091 commit 3b8f503
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,8 @@ source "arch/arm/mach-keystone/Kconfig"

source "arch/arm/mach-ks8695/Kconfig"

source "arch/arm/mach-meson/Kconfig"

source "arch/arm/mach-msm/Kconfig"

source "arch/arm/mach-moxart/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions arch/arm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
machine-$(CONFIG_ARCH_KS8695) += ks8695
machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
machine-$(CONFIG_ARCH_MESON) += meson
machine-$(CONFIG_ARCH_MMP) += mmp
machine-$(CONFIG_ARCH_MOXART) += moxart
machine-$(CONFIG_ARCH_MSM) += msm
Expand Down
13 changes: 13 additions & 0 deletions arch/arm/mach-meson/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
menuconfig ARCH_MESON
bool "Amlogic Meson SoCs" if ARCH_MULTI_V7
select GENERIC_IRQ_CHIP
select ARM_GIC

if ARCH_MESON

config MACH_MESON6
bool "Amlogic Meson6 (8726MX) SoCs support"
default ARCH_MESON
select MESON6_TIMER

endif
1 change: 1 addition & 0 deletions arch/arm/mach-meson/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj-$(CONFIG_ARCH_MESON) += meson.o
27 changes: 27 additions & 0 deletions arch/arm/mach-meson/meson.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright (C) 2014 Carlo Caione <carlo@caione.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
*/

#include <linux/of_platform.h>
#include <asm/mach/arch.h>

static const char * const m6_common_board_compat[] = {
"amlogic,meson6",
NULL,
};

DT_MACHINE_START(AML8726_MX, "Amlogic Meson6 platform")
.dt_compat = m6_common_board_compat,
MACHINE_END

0 comments on commit 3b8f503

Please sign in to comment.