aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTsahee Zidenberg <tsahee@annapurnalabs.com>2015-03-12 07:53:00 -0400
committerArnd Bergmann <arnd@arndb.de>2015-03-16 10:23:55 -0400
commit445d9b3060545812632456e0bded8e86b580b783 (patch)
treeffb5c441a5f945bdd8030a3a10419ea3d67bc9c2
parentc98ce6bf1a791d194186b3e1006f2b645569c6e3 (diff)
ARM: Alpine: Initial support for Alpine platform
This patch introduces initial architecture and device-tree support. Signed-off-by: Saeed Bishara <saeed@annapurnalabs.com> Signed-off-by: Tsahee Zidenberg <tsahee@annapurnalabs.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/Makefile1
-rw-r--r--arch/arm/mach-alpine/Kconfig8
-rw-r--r--arch/arm/mach-alpine/Makefile1
-rw-r--r--arch/arm/mach-alpine/alpine_machine.c28
5 files changed, 40 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9f1f09a2bc9b..b2796c806f42 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -844,6 +844,8 @@ config ARCH_VIRT
844# 844#
845source "arch/arm/mach-mvebu/Kconfig" 845source "arch/arm/mach-mvebu/Kconfig"
846 846
847source "arch/arm/mach-alpine/Kconfig"
848
847source "arch/arm/mach-asm9260/Kconfig" 849source "arch/arm/mach-asm9260/Kconfig"
848 850
849source "arch/arm/mach-at91/Kconfig" 851source "arch/arm/mach-at91/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 7f99cd652203..739588c83d8b 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -143,6 +143,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
143 143
144# Machine directory name. This list is sorted alphanumerically 144# Machine directory name. This list is sorted alphanumerically
145# by CONFIG_* macro name. 145# by CONFIG_* macro name.
146machine-$(CONFIG_ARCH_ALPINE) += alpine
146machine-$(CONFIG_ARCH_AT91) += at91 147machine-$(CONFIG_ARCH_AT91) += at91
147machine-$(CONFIG_ARCH_AXXIA) += axxia 148machine-$(CONFIG_ARCH_AXXIA) += axxia
148machine-$(CONFIG_ARCH_BCM) += bcm 149machine-$(CONFIG_ARCH_BCM) += bcm
diff --git a/arch/arm/mach-alpine/Kconfig b/arch/arm/mach-alpine/Kconfig
new file mode 100644
index 000000000000..44b9a8f4e5bb
--- /dev/null
+++ b/arch/arm/mach-alpine/Kconfig
@@ -0,0 +1,8 @@
1config ARCH_ALPINE
2 bool "Annapurna Labs Alpine platform" if ARCH_MULTI_V7
3 select ARM_AMBA
4 select ARM_GIC
5 select GENERIC_IRQ_CHIP
6 select HAVE_ARM_ARCH_TIMER
7 help
8 This enables support for the Annapurna Labs Alpine V1 boards.
diff --git a/arch/arm/mach-alpine/Makefile b/arch/arm/mach-alpine/Makefile
new file mode 100644
index 000000000000..b7dbb12d89cd
--- /dev/null
+++ b/arch/arm/mach-alpine/Makefile
@@ -0,0 +1 @@
obj-y += alpine_machine.o
diff --git a/arch/arm/mach-alpine/alpine_machine.c b/arch/arm/mach-alpine/alpine_machine.c
new file mode 100644
index 000000000000..b8e2145e962b
--- /dev/null
+++ b/arch/arm/mach-alpine/alpine_machine.c
@@ -0,0 +1,28 @@
1/*
2 * Machine declaration for Alpine platforms.
3 *
4 * Copyright (C) 2015 Annapurna Labs Ltd.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 */
16
17#include <linux/of_platform.h>
18
19#include <asm/mach/arch.h>
20
21static const char * const al_match[] __initconst = {
22 "al,alpine",
23 NULL,
24};
25
26DT_MACHINE_START(AL_DT, "Annapurna Labs Alpine")
27 .dt_compat = al_match,
28MACHINE_END