From patchwork Tue Nov 6 19:18:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1706121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 5CACE3FCDE for ; Tue, 6 Nov 2012 19:20:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TVofE-0006xQ-6X; Tue, 06 Nov 2012 19:18:20 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TVofA-0006wV-0v for linux-arm-kernel@lists.infradead.org; Tue, 06 Nov 2012 19:18:17 +0000 Received: by mail-pb0-f49.google.com with SMTP id xa7so578635pbc.36 for ; Tue, 06 Nov 2012 11:18:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=CTSG8+J7WK/eOUgS6mgzvV804+qWK6CRApVV5qe547Y=; b=P9PT1YHYRzZNVzyuk12YeUiG2OWi0LGKHyYNKhlzhA1Kb+StbXpvgLxbKld9uWAdh0 ku1wq2q4CnF9JnCPHlnUFXjgq5IyN2OVNdxelBwdZYzVAMT20zWqlms70pWF+TSSphVz k5v+7VRe+wxtZSeMTSdmzOOK5MwbCjXpkHH6+FbJBqtMa2ASLOqf5paXj25z152rx3aw gPFecoa+LXznAh16JbElITcF8sWxmi60Q50kpjJi2z9y4GY9Aoo1WYSuURXTCTwEuk5L j6Yr1EfQYLUGFKccMnp4L9KiI+yYT+TSQiOM+p2vwYAUCNuKmWxt7otv4xWEHHvZ3fjd aqYw== Received: by 10.68.228.228 with SMTP id sl4mr6427309pbc.5.1352229493569; Tue, 06 Nov 2012 11:18:13 -0800 (PST) Received: from localhost ([2001:470:1f05:1640:edcd:1210:3f97:5c42]) by mx.google.com with ESMTPS id ju7sm12749454pbb.60.2012.11.06.11.18.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 11:18:12 -0800 (PST) Date: Tue, 6 Nov 2012 11:18:19 -0800 From: Olof Johansson To: Rob Herring Subject: Re: [GIT PULL] Calxeda ECX-2000 support Message-ID: <20121106191819.GA11353@quad.lixom.net> References: <50917936.2030405@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50917936.2030405@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkml94vR8LvWc08mNGLAzt65gYeo2zKa/8XuVwaA9LEOdFEdOxGwVayVBA5m/nTzejU7Pg5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121106_141816_200216_F75E3C51 X-CRM114-Status: GOOD ( 17.76 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "linux-arm-kernel@lists.infradead.org" , 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Wed, Oct 31, 2012 at 02:17:10PM -0500, Rob Herring wrote: > Arnd, Olof, > > Please pull support for Calxeda ECX-2000 SOC. > > There will be a trivial conflict with the GIC move to drivers/irqchip once > that goes in. > > Rob > > The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64: > > Linux 3.7-rc3 (2012-10-28 12:24:48 -0700) > > are available in the git repository at: > > git://sources.calxeda.com/kernel/linux.git tags/calxeda-ecx-2000 > > for you to fetch changes up to e095c0d122c09efabe7d4136ce77f72c636c4879: > > ARM: highbank: Add initial ECX-2000 support (2012-10-31 13:47:01 -0500) > The addition of include of core.h in sysregs.h gives me a build error on multi_v7_defconfig due to missing guard ifdefs. I've added the following patch on top of your branch. commit 9186cea8283b0d235719e82607a1aec81db7ab8d Author: Olof Johansson AuthorDate: Tue Nov 6 11:09:10 2012 -0800 Commit: Olof Johansson CommitDate: Tue Nov 6 11:09:10 2012 -0800 ARM: highbank: add ifdef guards to core.h Fixes build error due to multiple includes: In file included from arch/arm/mach-highbank/sysregs.h:23:0, from arch/arm/mach-highbank/system.c:20: arch/arm/mach-highbank/core.h:8:91: error: redefinition of 'highbank_lluart_map_io' In file included from arch/arm/mach-highbank/system.c:19:0: arch/arm/mach-highbank/core.h:8:91: note: previous definition of 'highbank_lluart_map_io' was here Signed-off-by: Olof Johansson diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 286ec82..068c687 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h @@ -1,3 +1,6 @@ +#ifndef __HIGHBANK_CORE_H +#define __HIGHBANK_CORE_H + extern void highbank_set_cpu_jump(int cpu, void *jump_addr); extern void highbank_clocks_init(void); extern void highbank_restart(char, const char *); @@ -18,3 +21,5 @@ extern void highbank_smc1(int fn, int arg); extern void highbank_cpu_die(unsigned int cpu); extern struct smp_operations highbank_smp_ops; + +#endif