From patchwork Fri Oct 26 18:43:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1653191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id B0116DF2F6 for ; Fri, 26 Oct 2012 18:47:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRou0-00029j-2B; Fri, 26 Oct 2012 18:45:04 +0000 Received: from mail-oa0-f49.google.com ([209.85.219.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TRosa-0001aK-Ri for linux-arm-kernel@lists.infradead.org; Fri, 26 Oct 2012 18:43:37 +0000 Received: by mail-oa0-f49.google.com with SMTP id l10so2925666oag.36 for ; Fri, 26 Oct 2012 11:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=XlIOtx8K3beIx1M+rhc4bLAgCc4xEDSKKnifbBXkg+4=; b=MxAL1lW4T7MOz7uNEgqHNK/9d29+ZA0RR/H38nB2czAaSNX6ns3KWzEd3upKP5F3W1 TxeAPBenB2U0GO43nw9W1SW97F1fDLZeqD9Fn2awSkiXhVRLKxFnrbCusNIRyUmmqD48 svIXpndUNS2XON/n3sk7TI6ocrrjsfRscKC1LH8RsfJTYzq1t2afSMcSTYFoGHplbxd0 CwKZBtTiOuFs7X17sF9UotwW+zfX6dcvQEAnXSNSalFLdGxebkwmYJaj7BnEC+eggYi2 M4kU6EAj4rufHlIU/13U4m9ktzsHpoWrTLlhwQnvSDxAUv4HYQHOCkvaaeO3d30RIhoA Wj7A== Received: by 10.182.78.137 with SMTP id b9mr19398247obx.94.1351277015689; Fri, 26 Oct 2012 11:43:35 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id ig3sm2136320obb.0.2012.10.26.11.43.33 (version=SSLv3 cipher=OTHER); Fri, 26 Oct 2012 11:43:34 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] ARM: highbank: Add initial ECX-2000 support Date: Fri, 26 Oct 2012 13:43:08 -0500 Message-Id: <1351276988-28382-7-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351276988-28382-1-git-send-email-robherring2@gmail.com> References: <1351276988-28382-1-git-send-email-robherring2@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.219.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Olof Johansson , Rob Herring , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rob Herring And initial Calxeda ECX-2000 SOC support. This adds Cortex-A15 peripherals and machine DT match name. Signed-off-by: Rob Herring --- arch/arm/mach-highbank/Kconfig | 2 +- arch/arm/mach-highbank/highbank.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig index 0e1d0a4..551c97e 100644 --- a/arch/arm/mach-highbank/Kconfig +++ b/arch/arm/mach-highbank/Kconfig @@ -1,5 +1,5 @@ config ARCH_HIGHBANK - bool "Calxeda ECX-1000 (Highbank)" if ARCH_MULTI_V7 + bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_GIC diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 3da921a..3e60e57 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -70,6 +71,7 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr) } const static struct of_device_id irq_match[] = { + { .compatible = "arm,cortex-a15-gic", .data = gic_of_init, }, { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, {} }; @@ -126,6 +128,9 @@ static void __init highbank_timer_init(void) sp804_clockevents_init(timer_base, irq, "timer0"); twd_local_timer_of_register(); + + arch_timer_of_register(); + arch_timer_sched_clock_init(); } static struct sys_timer highbank_timer = { @@ -200,6 +205,7 @@ static void __init highbank_init(void) static const char *highbank_match[] __initconst = { "calxeda,highbank", + "calxeda,ecx-2000", NULL, };