From patchwork Thu Sep 20 06:45:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 185317 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 5BF6F2C007D for ; Thu, 20 Sep 2012 16:49:19 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEaX6-0001en-4O; Thu, 20 Sep 2012 06:46:44 +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 1TEaWY-0001V9-Qa for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 06:46:12 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so4537375pbb.36 for ; Wed, 19 Sep 2012 23:46:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=SPkuoahpk8LAV0NjqyohpQmDfGEBV+cHBMgqG0HMrUk=; b=YlCzO9YhJVkFGh5gmXFlbkFrDNPu6faLmG3oVuDoUyVgO27hI8q+nWw33iMmdhMJxP cxaPA5sDhLeLnWwlE+GDyIlN8/M+CCKYuILv5CfUwZirRKQ+YmBIpD2Js+lexIpr1OT/ ChbYv99hY4YJGljWYZ7dfC4zIm9E5AbI1+qj0KBoGMOQn6u8igryB4BKLC0aXejDD4/t IFas1kEGnHLzS2pmqDTh0k5Z3o1UuZY9mLx3PcFLUwriiytg2wA7vlrNn4krfi8qO/tV zY9o54OUHM2NEbcluBtAljOX7HfKjoOHRtoD4UPWzK2W77TMgZjxtdhwjiAoc1uLRl4K HSRw== Received: by 10.68.189.99 with SMTP id gh3mr4246163pbc.31.1348123570136; Wed, 19 Sep 2012 23:46:10 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([114.216.234.161]) by mx.google.com with ESMTPS id wn1sm3057024pbc.57.2012.09.19.23.46.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 23:46:09 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 01/34] ARM: imx: include board headers in the same folder Date: Thu, 20 Sep 2012 14:45:14 +0800 Message-Id: <1348123547-31082-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQn4m6tp/F27YeJn3vxD+D2ldfIU+cRDRQJLRwfFe0TUUUIymBi5ag+kFE6Tydge1GgOQYs3 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 [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: Sascha Hauer , Shawn Guo , Arnd Bergmann , Javier Martin , Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The headers that are only used by board files do not necessarily need to be in plat-mxc/include/mach. Move them to the same place as those board files. Signed-off-by: Shawn Guo Acked-by: Sascha Hauer Acked-by: Arnd Bergmann --- .../include/mach => mach-imx}/3ds_debugboard.h | 0 .../include/mach => mach-imx}/board-mx31lilly.h | 0 .../include/mach => mach-imx}/board-mx31lite.h | 0 .../include/mach => mach-imx}/board-mx31moboard.h | 0 .../include/mach => mach-imx}/board-pcm038.h | 0 .../include/mach => mach-imx}/eukrea-baseboards.h | 0 arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-cpuimx35.c | 2 +- arch/arm/mach-imx/mach-cpuimx51sd.c | 2 +- arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31lilly.c | 2 +- arch/arm/mach-imx/mach-mx31lite.c | 2 +- arch/arm/mach-imx/mach-mx31moboard.c | 2 +- arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- arch/arm/mach-imx/mach-mx51_3ds.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/mach-imx/mx31lilly-db.c | 2 +- arch/arm/mach-imx/mx31lite-db.c | 2 +- arch/arm/mach-imx/mx31moboard-smartbot.c | 2 +- 21 files changed, 15 insertions(+), 15 deletions(-) rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%) rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%) diff --git a/arch/arm/plat-mxc/include/mach/3ds_debugboard.h b/arch/arm/mach-imx/3ds_debugboard.h similarity index 100% rename from arch/arm/plat-mxc/include/mach/3ds_debugboard.h rename to arch/arm/mach-imx/3ds_debugboard.h diff --git a/arch/arm/plat-mxc/include/mach/board-mx31lilly.h b/arch/arm/mach-imx/board-mx31lilly.h similarity index 100% rename from arch/arm/plat-mxc/include/mach/board-mx31lilly.h rename to arch/arm/mach-imx/board-mx31lilly.h diff --git a/arch/arm/plat-mxc/include/mach/board-mx31lite.h b/arch/arm/mach-imx/board-mx31lite.h similarity index 100% rename from arch/arm/plat-mxc/include/mach/board-mx31lite.h rename to arch/arm/mach-imx/board-mx31lite.h diff --git a/arch/arm/plat-mxc/include/mach/board-mx31moboard.h b/arch/arm/mach-imx/board-mx31moboard.h similarity index 100% rename from arch/arm/plat-mxc/include/mach/board-mx31moboard.h rename to arch/arm/mach-imx/board-mx31moboard.h diff --git a/arch/arm/plat-mxc/include/mach/board-pcm038.h b/arch/arm/mach-imx/board-pcm038.h similarity index 100% rename from arch/arm/plat-mxc/include/mach/board-pcm038.h rename to arch/arm/mach-imx/board-pcm038.h diff --git a/arch/arm/plat-mxc/include/mach/eukrea-baseboards.h b/arch/arm/mach-imx/eukrea-baseboards.h similarity index 100% rename from arch/arm/plat-mxc/include/mach/eukrea-baseboards.h rename to arch/arm/mach-imx/eukrea-baseboards.h diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 2bb9e18..1734320 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c @@ -34,13 +34,13 @@ #include #include -#include #include #include #include #include #include "devices-imx27.h" +#include "eukrea-baseboards.h" static const int eukrea_cpuimx27_pins[] __initconst = { /* UART1 */ diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index d49b0ec..0abfcb4 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c @@ -37,12 +37,12 @@ #include #include -#include #include #include #include #include "devices-imx35.h" +#include "eukrea-baseboards.h" static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c index b87cc49..6cb3887 100644 --- a/arch/arm/mach-imx/mach-cpuimx51sd.c +++ b/arch/arm/mach-imx/mach-cpuimx51sd.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include "devices-imx51.h" #include "cpu_op-mx51.h" +#include "eukrea-baseboards.h" #define USBH1_RST IMX_GPIO_NR(2, 28) #define ETH_RST IMX_GPIO_NR(2, 31) diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c index 017bbb70..4eab1d7 100644 --- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c +++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include "devices-imx25.h" +#include "eukrea-baseboards.h" static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 58c24c1..16dff39 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c @@ -40,8 +40,8 @@ #include #include #include -#include +#include "3ds_debugboard.h" #include "devices-imx27.h" #define SD1_EN_GPIO IMX_GPIO_NR(2, 25) diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index 8915f93..6750443 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c @@ -39,9 +39,9 @@ #include #include #include -#include #include +#include "3ds_debugboard.h" #include "devices-imx31.h" static int mx31_3ds_pins[] = { diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 34b9bf0..2be500a 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c @@ -45,9 +45,9 @@ #include #include #include -#include #include +#include "board-mx31lilly.h" #include "devices-imx31.h" /* diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index c8785b3..1704308 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c @@ -41,10 +41,10 @@ #include #include -#include #include #include +#include "board-mx31lite.h" #include "devices-imx31.h" /* diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index 459e754..2290d30 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c @@ -42,13 +42,13 @@ #include #include #include -#include #include #include #include #include #include +#include "board-mx31moboard.h" #include "devices-imx31.h" static unsigned int moboard_pins[] = { diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index 504983c..aac59b0 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c @@ -46,11 +46,11 @@ #include #include #include -#include #include