From patchwork Fri Oct 7 07:28:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 118239 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AA0CB71A4 for ; Fri, 7 Oct 2011 18:28:40 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RC4r9-0001U1-Ua; Fri, 07 Oct 2011 07:28:32 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RC4r9-0002Sv-MO; Fri, 07 Oct 2011 07:28:31 +0000 Received: from mail-vw0-f49.google.com ([209.85.212.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RC4r6-0002Sb-RT for linux-arm-kernel@lists.infradead.org; Fri, 07 Oct 2011 07:28:29 +0000 Received: by vws15 with SMTP id 15so3895612vws.36 for ; Fri, 07 Oct 2011 00:28:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=7RUnKPipJp3C1vKXCrDzGNFhfRDRb1ErMa+WgQDit9Y=; b=MxBwMPrDFoIgWV6TQOarmKEjj9kPcPZ4oCq460d8+4fUHzI7MVwINbtsIvZj2a2VNK 0t8cJovC+JZYasoeE76+sfDnUSLGVOpGDli8YSp71k+2sXEyBTNuGfUyd4WZQz9LZewj XsNCPWNyRksAzREvwoq0B+JBAaKe+/7anS3hI= Received: by 10.52.22.9 with SMTP id z9mr1330556vde.59.1317972507224; Fri, 07 Oct 2011 00:28:27 -0700 (PDT) MIME-Version: 1.0 Received: by 10.52.109.198 with HTTP; Fri, 7 Oct 2011 00:28:07 -0700 (PDT) In-Reply-To: <1317499438-14058-13-git-send-email-arnd@arndb.de> References: <1317499438-14058-1-git-send-email-arnd@arndb.de> <1317499438-14058-13-git-send-email-arnd@arndb.de> From: Eric Miao Date: Fri, 7 Oct 2011 15:28:07 +0800 Message-ID: Subject: Re: [PATCH 12/26] ARM: pxa: pxa95x/saarb depends on pxa3xx code To: Arnd Bergmann X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111007_032829_051891_8D9993D1 X-CRM114-Status: GOOD ( 20.09 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (eric.y.miao[at]gmail.com) -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: Jason Chagas , Russell King - ARM Linux , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Sun, Oct 2, 2011 at 4:03 AM, Arnd Bergmann wrote: > saarb uses pxa3xx_map_io and pxa3xx_handle_irq, which are part > of the pxa3xx code. This makes sure the necessary header and > implementation is used when building the board file. > > Signed-off-by: Arnd Bergmann > --- >  arch/arm/mach-pxa/Makefile |    2 +- >  arch/arm/mach-pxa/saarb.c  |    2 ++ >  2 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile > index cc39d17..be0f7df 100644 > --- a/arch/arm/mach-pxa/Makefile > +++ b/arch/arm/mach-pxa/Makefile > @@ -19,7 +19,7 @@ endif >  obj-$(CONFIG_PXA25x)           += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o >  obj-$(CONFIG_PXA27x)           += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o >  obj-$(CONFIG_PXA3xx)           += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o > -obj-$(CONFIG_PXA95x)           += mfp-pxa3xx.o clock-pxa3xx.o pxa95x.o smemc.o > +obj-$(CONFIG_PXA95x)           += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o pxa95x.o smemc.o >  obj-$(CONFIG_CPU_PXA300)       += pxa300.o >  obj-$(CONFIG_CPU_PXA320)       += pxa320.o >  obj-$(CONFIG_CPU_PXA930)       += pxa930.o > diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c > index ebd6379..829c514 100644 > --- a/arch/arm/mach-pxa/saarb.c > +++ b/arch/arm/mach-pxa/saarb.c > @@ -25,6 +25,8 @@ >  #include >  #include > > +#include > + >  #include "generic.h" > >  #define SAARB_NR_IRQS  (IRQ_BOARD_START + 40) > -- > 1.7.5.4 > > PXA95x is actually PJ4 based, which is ARMv7/v6 compatible, not like it's predecessor PXA93x. Although they are currently sharing some code, I expect a fork in the near future. To cause less confusion here, I'd propose to further introduce pxa95x.h, and to remove the unnecessary #include of and diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index cc39d17..be0f7df 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -19,7 +19,7 @@ endif obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o -obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa95x.o smemc.o +obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o pxa95x.o smemc.o obj-$(CONFIG_CPU_PXA300) += pxa300.o obj-$(CONFIG_CPU_PXA320) += pxa320.o obj-$(CONFIG_CPU_PXA930) += pxa930.o diff --git a/arch/arm/mach-pxa/include/mach/pxa95x.h b/arch/arm/mach-pxa/include/mach/pxa95x.h new file mode 100644 index 0000000..cbb097c --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa95x.h @@ -0,0 +1,7 @@ +#ifndef __MACH_PXA95X_H +#define __MACH_PXA95X_H + +#include +#include + +#endif /* __MACH_PXA95X_H */ diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c index ebd6379..aebd5d9 100644 --- a/arch/arm/mach-pxa/saarb.c +++ b/arch/arm/mach-pxa/saarb.c @@ -21,9 +21,8 @@ #include #include -#include -#include #include +#include #include "generic.h"