From patchwork Sat Sep 1 00:26:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 1394581 Return-Path: X-Original-To: patchwork-spi-devel-general@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by patchwork1.kernel.org (Postfix) with ESMTP id EE1043FDF5 for ; Sat, 1 Sep 2012 00:26:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1T7bXs-0001Px-7C; Sat, 01 Sep 2012 00:26:40 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1T7bXq-0001Pr-Q4 for spi-devel-general@lists.sourceforge.net; Sat, 01 Sep 2012 00:26:38 +0000 X-ACL-Warn: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1T7bXp-0004Nq-Lv for spi-devel-general@lists.sourceforge.net; Sat, 01 Sep 2012 00:26:38 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=muffinssi.local) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1T7bXk-0003SP-4O; Sat, 01 Sep 2012 00:26:32 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+guCCkZuq29A4AJuKzC2cj Subject: [PATCH 4/4] ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Date: Fri, 31 Aug 2012 17:26:30 -0700 Message-ID: <20120901002630.23715.39417.stgit@muffinssi.local> In-Reply-To: <20120901002534.23715.28654.stgit@muffinssi.local> References: <20120901002534.23715.28654.stgit@muffinssi.local> User-Agent: StGit/0.16-2-g0d85 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.71 listed in list.dnswl.org] -0.0 AWL AWL: From: address is in the auto white-list X-Headers-End: 1T7bXp-0004Nq-Lv Cc: spi-devel-general@lists.sourceforge.net, linux-omap@vger.kernel.org X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces@lists.sourceforge.net There's no need to have these in plat-omap any longer. Note that these could eventually be made local to mach-omap1 instead of being in mach. But to do that, at least various driver access using omap7xxx.h registers needs to be fixed first. Cc: spi-devel-general@lists.sourceforge.net Cc: Grant Likely Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-htcherald.c | 4 ++-- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/include/mach/hardware.h | 6 +++--- arch/arm/mach-omap1/include/mach/omap1510.h | 3 +-- arch/arm/mach-omap1/include/mach/omap16xx.h | 3 +-- arch/arm/mach-omap1/include/mach/omap7xx.h | 3 +-- drivers/spi/spi-omap-uwire.c | 3 ++- 7 files changed, 11 insertions(+), 13 deletions(-) rename arch/arm/{plat-omap/include/plat/omap1510.h => mach-omap1/include/mach/omap1510.h} (97%) rename arch/arm/{plat-omap/include/plat/omap16xx.h => mach-omap1/include/mach/omap16xx.h} (99%) rename arch/arm/{plat-omap/include/plat/omap7xx.h => mach-omap1/include/mach/omap7xx.h} (98%) ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c index bdb94fe..4fe4884 100644 --- a/arch/arm/mach-omap1/board-htcherald.c +++ b/arch/arm/mach-omap1/board-htcherald.c @@ -37,14 +37,14 @@ #include #include #include +#include #include #include -#include -#include #include +#include #include #include diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 1feca35..05fdbd9 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -23,8 +23,8 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-omap1/include/mach/hardware.h b/arch/arm/mach-omap1/include/mach/hardware.h index bd3b95e..84248d2 100644 --- a/arch/arm/mach-omap1/include/mach/hardware.h +++ b/arch/arm/mach-omap1/include/mach/hardware.h @@ -311,8 +311,8 @@ static inline u32 omap_cs3_phys(void) * --------------------------------------------------------------------------- */ -#include -#include -#include +#include "omap7xx.h" +#include "omap1510.h" +#include "omap16xx.h" #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ diff --git a/arch/arm/plat-omap/include/plat/omap1510.h b/arch/arm/mach-omap1/include/mach/omap1510.h similarity index 97% rename from arch/arm/plat-omap/include/plat/omap1510.h rename to arch/arm/mach-omap1/include/mach/omap1510.h index d240046..8fe05d6 100644 --- a/arch/arm/plat-omap/include/plat/omap1510.h +++ b/arch/arm/mach-omap1/include/mach/omap1510.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-omap/include/mach/omap1510.h - * +/* * Hardware definitions for TI OMAP1510 processor. * * Cleanup for Linux-2.6 by Dirk Behme diff --git a/arch/arm/plat-omap/include/plat/omap16xx.h b/arch/arm/mach-omap1/include/mach/omap16xx.h similarity index 99% rename from arch/arm/plat-omap/include/plat/omap16xx.h rename to arch/arm/mach-omap1/include/mach/omap16xx.h index e69e1d8..cd1c724 100644 --- a/arch/arm/plat-omap/include/plat/omap16xx.h +++ b/arch/arm/mach-omap1/include/mach/omap16xx.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-omap/include/mach/omap16xx.h - * +/* * Hardware definitions for TI OMAP1610/5912/1710 processors. * * Cleanup for Linux-2.6 by Dirk Behme diff --git a/arch/arm/plat-omap/include/plat/omap7xx.h b/arch/arm/mach-omap1/include/mach/omap7xx.h similarity index 98% rename from arch/arm/plat-omap/include/plat/omap7xx.h rename to arch/arm/mach-omap1/include/mach/omap7xx.h index 48e4757..63da994 100644 --- a/arch/arm/plat-omap/include/plat/omap7xx.h +++ b/arch/arm/mach-omap1/include/mach/omap7xx.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-omap/include/mach/omap7xx.h - * +/* * Hardware definitions for TI OMAP7XX processor. * * Cleanup for Linux-2.6 by Dirk Behme diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c index 9b0d716..a3996a1 100644 --- a/drivers/spi/spi-omap-uwire.c +++ b/drivers/spi/spi-omap-uwire.c @@ -53,7 +53,8 @@ #include #include -#include /* OMAP7XX_IO_CONF registers */ + +#include /* OMAP7XX_IO_CONF registers */ /* FIXME address is now a platform device resource,