From patchwork Thu Aug 23 05:41:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song X-Patchwork-Id: 1364461 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 1A0273FCAE for ; Thu, 23 Aug 2012 05:47:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4QD2-0006mD-Ky; Thu, 23 Aug 2012 05:44:00 +0000 Received: from cluster-d.mailcontrol.com ([85.115.60.190]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T4QCo-0006ii-7S for linux-arm-kernel@lists.infradead.org; Thu, 23 Aug 2012 05:43:47 +0000 Received: from rly38d.srv.mailcontrol.com (localhost.localdomain [127.0.0.1]) by rly38d.srv.mailcontrol.com (MailControl) with ESMTP id q7N5hiWK005245 for ; Thu, 23 Aug 2012 06:43:44 +0100 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by rly38d.srv.mailcontrol.com (MailControl) id q7N5h88X031846 for ; Thu, 23 Aug 2012 06:43:08 +0100 Received: from banasiexc01.ASIA.ROOT.PRI ([202.80.51.114]) by rly38d-eth0.srv.mailcontrol.com (envelope-sender ) (MIMEDefang) with ESMTP id q7N5h4mM031179 (TLS bits=128 verify=FAIL); Thu, 23 Aug 2012 06:43:08 +0100 (BST) Received: from SHAASIEXC02.ASIA.ROOT.PRI (10.125.12.85) by banasiexc01.ASIA.ROOT.PRI (10.190.12.21) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 23 Aug 2012 11:13:03 +0530 Received: from localhost.localdomain (10.125.36.195) by asimail.csr.com (10.125.12.88) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 23 Aug 2012 13:43:01 +0800 From: Barry Song To: , Subject: [PATCH v2 1/3] ARM: PRIMA2: use DT_MACHINE_START and convert to generic board Date: Thu, 23 Aug 2012 13:41:57 +0800 Message-ID: <1345700519-667-2-git-send-email-Barry.Song@csr.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1345700519-667-1-git-send-email-Barry.Song@csr.com> References: <1345700519-667-1-git-send-email-Barry.Song@csr.com> MIME-Version: 1.0 X-Originating-IP: [10.125.36.195] X-Scanned-By: MailControl 8316.0 (www.mailcontrol.com) on 10.68.1.148 X-Spam-Note: CRM114 invocation failed 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 [85.115.60.190 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org, workgroup.linux@csr.com, Barry Song 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 From: Barry Song we will have SiRFMarco and SiRFPolo, all of them will be in the generic board. Signed-off-by: Barry Song --- -v2: rename prima2.c to common.c instead of board-generic.c delete redundant atag_offset arch/arm/mach-prima2/Makefile | 2 +- arch/arm/mach-prima2/{prima2.c => common.c} | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) rename arch/arm/mach-prima2/{prima2.c => common.c} (81%) diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile index 841847d..f2cde60 100644 --- a/arch/arm/mach-prima2/Makefile +++ b/arch/arm/mach-prima2/Makefile @@ -1,7 +1,7 @@ obj-y := timer.o obj-y += irq.o obj-y += rstc.o -obj-y += prima2.o +obj-y += common.o obj-y += rtciobrg.o obj-$(CONFIG_DEBUG_LL) += lluart.o obj-$(CONFIG_CACHE_L2X0) += l2x0.o diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/common.c similarity index 81% rename from arch/arm/mach-prima2/prima2.c rename to arch/arm/mach-prima2/common.c index e9a17ae..f25a541 100644 --- a/arch/arm/mach-prima2/prima2.c +++ b/arch/arm/mach-prima2/common.c @@ -30,20 +30,21 @@ void __init sirfsoc_init_late(void) sirfsoc_pm_init(); } -static const char *prima2cb_dt_match[] __initdata = { - "sirf,prima2-cb", +#ifdef CONFIG_ARCH_PRIMA2 +static const char *prima2_dt_match[] __initdata = { + "sirf,prima2", NULL }; -MACHINE_START(PRIMA2_EVB, "prima2cb") +DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") /* Maintainer: Barry Song */ - .atag_offset = 0x100, .map_io = sirfsoc_map_lluart, .init_irq = sirfsoc_of_irq_init, .timer = &sirfsoc_timer, .dma_zone_size = SZ_256M, .init_machine = sirfsoc_mach_init, .init_late = sirfsoc_init_late, - .dt_compat = prima2cb_dt_match, + .dt_compat = prima2_dt_match, .restart = sirfsoc_restart, MACHINE_END +#endif