From patchwork Mon Sep 17 05:35:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1465441 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 0DAE5400EB for ; Mon, 17 Sep 2012 05:56:02 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDUEc-0004lE-Nd; Mon, 17 Sep 2012 05:51:08 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TDU1M-0001iY-2T for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 05:37:40 +0000 Received: by mail-pz0-f49.google.com with SMTP id q27so2706771daj.36 for ; Sun, 16 Sep 2012 22:37:23 -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=AbY8OjewcwAxV0HRaJE9RX5W0Wmc+E+LtLSyPvqXLcw=; b=hjeNO3Px4TcvOWeLSf7aymjGbS+m1HsMF/INRajXWmu/xcbWbYLOTXCaQrpdgV9ThB k9dFn62JnsRH6MInx2erDphF7YPJg5MlbgNkgfpaHIrWC5ajgrtuD2W1Hp5l0jv28kD9 HOtBI21sUJAlRseVzdFEMZ5FMAYeTMEeNhZScPZmoeTo2CX43PIC4O9Io97gExBJpPcS gWn/FzL8iJdVX/CRapNHphaPpd081d0ahw3pubvI7i3Mgp3DMaapwNaN8tMuK4UMtSPI hohtw6blIEvSBg6j87KPkXx5d1kQXwXHX6cCOeXTBVcbtelc9PFJcAawGmvwzs4uLQRm CGsA== Received: by 10.68.240.7 with SMTP id vw7mr20302433pbc.152.1347860243671; Sun, 16 Sep 2012 22:37:23 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([221.225.141.190]) by mx.google.com with ESMTPS id it6sm6386097pbc.14.2012.09.16.22.37.19 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Sep 2012 22:37:23 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 32/34] ARM: imx: include hardware.h rather than mach/hardware.h Date: Mon, 17 Sep 2012 13:35:01 +0800 Message-Id: <1347860103-4141-33-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> References: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQluLvdyobXeuCBiKvpZemQfuR9Hy7dL8t8ZdpU8dWQzBVtnj90KI99Q4DwZg3I0Q/SWdrNz 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.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , Sascha Hauer , Shawn Guo , Arnd Bergmann , Rob Herring 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org It moves a bunch of header files included in hardware.h and itself from mach-imx/include/mach to mach-imx, and updates users to include hardware.h rather than mach/hardware.h. The files in mach-imx/devices will need to include "../hardware.h". Signed-off-by: Shawn Guo --- arch/arm/mach-imx/3ds_debugboard.c | 2 +- arch/arm/mach-imx/avic.c | 2 +- arch/arm/mach-imx/clk-imx1.c | 3 +-- arch/arm/mach-imx/clk-imx21.c | 3 +-- arch/arm/mach-imx/clk-imx25.c | 5 ++-- arch/arm/mach-imx/clk-imx27.c | 3 +-- arch/arm/mach-imx/clk-imx31.c | 5 ++-- arch/arm/mach-imx/clk-imx35.c | 3 +-- arch/arm/mach-imx/clk-imx51-imx53.c | 3 +-- arch/arm/mach-imx/clk-pllv1.c | 2 +- arch/arm/mach-imx/cpu-imx25.c | 2 +- arch/arm/mach-imx/cpu-imx27.c | 2 +- arch/arm/mach-imx/cpu-imx31.c | 2 +- arch/arm/mach-imx/cpu-imx35.c | 2 +- arch/arm/mach-imx/cpu-imx5.c | 3 ++- arch/arm/mach-imx/cpu.c | 3 ++- arch/arm/mach-imx/cpu_op-mx51.c | 3 ++- arch/arm/mach-imx/cpufreq.c | 3 ++- arch/arm/mach-imx/devices/platform-ahci-imx.c | 3 ++- arch/arm/mach-imx/devices/platform-fec.c | 3 ++- arch/arm/mach-imx/devices/platform-flexcan.c | 2 +- arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 3 ++- arch/arm/mach-imx/devices/platform-gpio_keys.c | 3 ++- arch/arm/mach-imx/devices/platform-imx-fb.c | 3 ++- arch/arm/mach-imx/devices/platform-imx-i2c.c | 2 +- arch/arm/mach-imx/devices/platform-imx-keypad.c | 2 +- arch/arm/mach-imx/devices/platform-imx-ssi.c | 2 +- arch/arm/mach-imx/devices/platform-imx-uart.c | 2 +- arch/arm/mach-imx/devices/platform-imx2-wdt.c | 3 ++- arch/arm/mach-imx/devices/platform-imx21-hcd.c | 2 +- arch/arm/mach-imx/devices/platform-imx_udc.c | 2 +- arch/arm/mach-imx/devices/platform-imxdi_rtc.c | 3 ++- arch/arm/mach-imx/devices/platform-ipu-core.c | 3 ++- arch/arm/mach-imx/devices/platform-mx2-camera.c | 2 +- arch/arm/mach-imx/devices/platform-mxc-ehci.c | 3 ++- arch/arm/mach-imx/devices/platform-mxc-mmc.c | 3 ++- arch/arm/mach-imx/devices/platform-mxc_nand.c | 3 ++- arch/arm/mach-imx/devices/platform-mxc_pwm.c | 2 +- arch/arm/mach-imx/devices/platform-mxc_rnga.c | 2 +- arch/arm/mach-imx/devices/platform-mxc_rtc.c | 2 +- arch/arm/mach-imx/devices/platform-mxc_w1.c | 2 +- arch/arm/mach-imx/devices/platform-pata_imx.c | 2 +- .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 3 ++- arch/arm/mach-imx/devices/platform-spi_imx.c | 2 +- arch/arm/mach-imx/ehci-imx25.c | 4 +-- arch/arm/mach-imx/ehci-imx27.c | 4 +-- arch/arm/mach-imx/ehci-imx31.c | 4 +-- arch/arm/mach-imx/ehci-imx35.c | 4 +-- arch/arm/mach-imx/ehci-imx5.c | 4 +-- arch/arm/mach-imx/epit.c | 3 +-- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 3 +-- arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 4 +-- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 3 +-- arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 3 +-- arch/arm/mach-imx/{include/mach => }/hardware.h | 26 ++++++++++---------- arch/arm/mach-imx/imx27-dt.c | 2 +- arch/arm/mach-imx/imx31-dt.c | 2 +- arch/arm/mach-imx/imx51-dt.c | 2 +- arch/arm/mach-imx/iomux-imx31.c | 2 +- arch/arm/mach-imx/iomux-v1.c | 2 +- arch/arm/mach-imx/iomux-v3.c | 2 +- arch/arm/mach-imx/lluart.c | 3 ++- arch/arm/mach-imx/mach-apf9328.c | 3 +-- arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- arch/arm/mach-imx/mach-bug.c | 3 +-- arch/arm/mach-imx/mach-cpuimx27.c | 3 +-- arch/arm/mach-imx/mach-cpuimx35.c | 3 +-- arch/arm/mach-imx/mach-cpuimx51sd.c | 3 +-- arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 4 +-- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-imx27ipcam.c | 2 +- arch/arm/mach-imx/mach-imx27lite.c | 2 +- arch/arm/mach-imx/mach-imx53.c | 2 +- arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 3 +-- arch/arm/mach-imx/mach-mx1ads.c | 3 +-- arch/arm/mach-imx/mach-mx21ads.c | 2 +- arch/arm/mach-imx/mach-mx25_3ds.c | 4 +-- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31ads.c | 2 +- arch/arm/mach-imx/mach-mx31lilly.c | 3 +-- arch/arm/mach-imx/mach-mx31lite.c | 3 +-- arch/arm/mach-imx/mach-mx31moboard.c | 2 +- arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- arch/arm/mach-imx/mach-mx50_rdp.c | 3 +-- arch/arm/mach-imx/mach-mx51_3ds.c | 3 +-- arch/arm/mach-imx/mach-mx51_babbage.c | 3 +-- arch/arm/mach-imx/mach-mxt_td60.c | 2 +- arch/arm/mach-imx/mach-pca100.c | 2 +- arch/arm/mach-imx/mach-pcm037.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 3 +-- arch/arm/mach-imx/mach-pcm043.c | 3 +-- arch/arm/mach-imx/mach-qong.c | 2 +- arch/arm/mach-imx/mach-scb9328.c | 3 +-- arch/arm/mach-imx/mach-vpr200.c | 3 +-- arch/arm/mach-imx/mm-imx1.c | 3 +-- arch/arm/mach-imx/mm-imx21.c | 2 +- arch/arm/mach-imx/mm-imx25.c | 5 ++-- arch/arm/mach-imx/mm-imx27.c | 2 +- arch/arm/mach-imx/mm-imx3.c | 3 +-- arch/arm/mach-imx/mm-imx5.c | 3 +-- arch/arm/mach-imx/{include/mach => }/mx1.h | 0 arch/arm/mach-imx/{include/mach => }/mx21.h | 0 arch/arm/mach-imx/{include/mach => }/mx25.h | 0 arch/arm/mach-imx/{include/mach => }/mx27.h | 0 arch/arm/mach-imx/{include/mach => }/mx2x.h | 0 arch/arm/mach-imx/{include/mach => }/mx31.h | 0 arch/arm/mach-imx/mx31lilly-db.c | 3 +-- arch/arm/mach-imx/mx31lite-db.c | 3 +-- arch/arm/mach-imx/mx31moboard-devboard.c | 3 +-- arch/arm/mach-imx/mx31moboard-marxbot.c | 3 +-- arch/arm/mach-imx/mx31moboard-smartbot.c | 3 +-- arch/arm/mach-imx/{include/mach => }/mx35.h | 0 arch/arm/mach-imx/{include/mach => }/mx3x.h | 0 arch/arm/mach-imx/{include/mach => }/mx50.h | 0 arch/arm/mach-imx/{include/mach => }/mx51.h | 0 arch/arm/mach-imx/{include/mach => }/mx53.h | 0 arch/arm/mach-imx/{include/mach => }/mx6q.h | 0 arch/arm/mach-imx/{include/mach => }/mxc.h | 0 arch/arm/mach-imx/pcm970-baseboard.c | 3 +-- arch/arm/mach-imx/platsmp.c | 2 +- arch/arm/mach-imx/pm-imx27.c | 3 ++- arch/arm/mach-imx/pm-imx3.c | 2 +- arch/arm/mach-imx/pm-imx5.c | 2 +- arch/arm/mach-imx/pm-imx6q.c | 2 +- arch/arm/mach-imx/system.c | 2 +- arch/arm/mach-imx/time.c | 2 +- arch/arm/mach-imx/tzic.c | 2 +- 130 files changed, 158 insertions(+), 177 deletions(-) rename arch/arm/mach-imx/{include/mach => }/hardware.h (94%) rename arch/arm/mach-imx/{include/mach => }/mx1.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx21.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx25.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx27.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx2x.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx31.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx35.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx3x.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx50.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx51.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx53.h (100%) rename arch/arm/mach-imx/{include/mach => }/mx6q.h (100%) rename arch/arm/mach-imx/{include/mach => }/mxc.h (100%) diff --git a/arch/arm/mach-imx/3ds_debugboard.c b/arch/arm/mach-imx/3ds_debugboard.c index 5c10ad0..1343773 100644 --- a/arch/arm/mach-imx/3ds_debugboard.c +++ b/arch/arm/mach-imx/3ds_debugboard.c @@ -21,7 +21,7 @@ #include #include -#include +#include "hardware.h" /* LAN9217 ethernet base address */ #define LAN9217_BASE_ADDR(n) (n + 0x0) diff --git a/arch/arm/mach-imx/avic.c b/arch/arm/mach-imx/avic.c index 204fd94..adc64bc 100644 --- a/arch/arm/mach-imx/avic.c +++ b/arch/arm/mach-imx/avic.c @@ -24,10 +24,10 @@ #include #include #include -#include #include #include "common.h" +#include "hardware.h" #include "irq-common.h" #define AVIC_INTCNTL 0x00 /* int control reg */ diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c index 4bff66a..7b76bc3 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c @@ -22,10 +22,9 @@ #include #include -#include - #include "clk.h" #include "common.h" +#include "hardware.h" /* CCM register addresses */ #define IO_ADDR_CCM(off) (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off))) diff --git a/arch/arm/mach-imx/clk-imx21.c b/arch/arm/mach-imx/clk-imx21.c index e981b48..52b0563 100644 --- a/arch/arm/mach-imx/clk-imx21.c +++ b/arch/arm/mach-imx/clk-imx21.c @@ -25,10 +25,9 @@ #include #include -#include - #include "clk.h" #include "common.h" +#include "hardware.h" #define IO_ADDR_CCM(off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off))) diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c index da7155d..d150207 100644 --- a/arch/arm/mach-imx/clk-imx25.c +++ b/arch/arm/mach-imx/clk-imx25.c @@ -24,11 +24,10 @@ #include #include -#include -#include - #include "clk.h" #include "common.h" +#include "hardware.h" +#include "mx25.h" #define CRM_BASE MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR) diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c index f3a66a9..e813745 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c @@ -6,10 +6,9 @@ #include #include -#include - #include "clk.h" #include "common.h" +#include "hardware.h" #define IO_ADDR_CCM(off) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off))) diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index 1277f73..8be64e0 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -22,12 +22,11 @@ #include #include -#include -#include - #include "clk.h" #include "common.h" #include "crmregs-imx3.h" +#include "hardware.h" +#include "mx31.h" static const char *mcu_main_sel[] = { "spll", "mpll", }; static const char *per_sel[] = { "per_div", "ipg", }; diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index fec48e6..66f3d65 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c @@ -14,11 +14,10 @@ #include #include -#include - #include "crmregs-imx3.h" #include "clk.h" #include "common.h" +#include "hardware.h" struct arm_ahb_div { unsigned char arm, ahb, sel; diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index 22afd5f..e9fd813 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@ -14,11 +14,10 @@ #include #include -#include - #include "crm-regs-imx5.h" #include "clk.h" #include "common.h" +#include "hardware.h" /* Low-power Audio Playback Mode clock */ static const char *lp_apm_sel[] = { "osc", }; diff --git a/arch/arm/mach-imx/clk-pllv1.c b/arch/arm/mach-imx/clk-pllv1.c index 02f9013..abff350 100644 --- a/arch/arm/mach-imx/clk-pllv1.c +++ b/arch/arm/mach-imx/clk-pllv1.c @@ -4,10 +4,10 @@ #include #include #include -#include #include "clk.h" #include "common.h" +#include "hardware.h" /** * pll v1 diff --git a/arch/arm/mach-imx/cpu-imx25.c b/arch/arm/mach-imx/cpu-imx25.c index 79d4d1c..96ec64b 100644 --- a/arch/arm/mach-imx/cpu-imx25.c +++ b/arch/arm/mach-imx/cpu-imx25.c @@ -11,9 +11,9 @@ */ #include #include -#include #include "iim.h" +#include "hardware.h" static int mx25_cpu_rev = -1; diff --git a/arch/arm/mach-imx/cpu-imx27.c b/arch/arm/mach-imx/cpu-imx27.c index ff38e15..fe8d36f 100644 --- a/arch/arm/mach-imx/cpu-imx27.c +++ b/arch/arm/mach-imx/cpu-imx27.c @@ -24,7 +24,7 @@ #include #include -#include +#include "hardware.h" static int mx27_cpu_rev = -1; static int mx27_cpu_partnumber; diff --git a/arch/arm/mach-imx/cpu-imx31.c b/arch/arm/mach-imx/cpu-imx31.c index 51c938f..fde1860 100644 --- a/arch/arm/mach-imx/cpu-imx31.c +++ b/arch/arm/mach-imx/cpu-imx31.c @@ -11,9 +11,9 @@ #include #include -#include #include "common.h" +#include "hardware.h" #include "iim.h" static int mx31_cpu_rev = -1; diff --git a/arch/arm/mach-imx/cpu-imx35.c b/arch/arm/mach-imx/cpu-imx35.c index 8b36d3a..ec3aaa0 100644 --- a/arch/arm/mach-imx/cpu-imx35.c +++ b/arch/arm/mach-imx/cpu-imx35.c @@ -10,8 +10,8 @@ */ #include #include -#include +#include "hardware.h" #include "iim.h" static int mx35_cpu_rev = -1; diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c index 8eb15a2..d887600 100644 --- a/arch/arm/mach-imx/cpu-imx5.c +++ b/arch/arm/mach-imx/cpu-imx5.c @@ -15,9 +15,10 @@ #include #include #include -#include #include +#include "hardware.h" + static int mx5_cpu_rev = -1; #define IIM_SREV 0x24 diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 220dd6f..03fcbd0 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -1,7 +1,8 @@ #include #include -#include + +#include "hardware.h" unsigned int __mxc_cpu_type; EXPORT_SYMBOL(__mxc_cpu_type); diff --git a/arch/arm/mach-imx/cpu_op-mx51.c b/arch/arm/mach-imx/cpu_op-mx51.c index 7b92cd6..b9ef692 100644 --- a/arch/arm/mach-imx/cpu_op-mx51.c +++ b/arch/arm/mach-imx/cpu_op-mx51.c @@ -13,9 +13,10 @@ #include #include -#include #include +#include "hardware.h" + static struct cpu_op mx51_cpu_op[] = { { .cpu_rate = 160000000,}, diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c index b5b6f80..36e8b39 100644 --- a/arch/arm/mach-imx/cpufreq.c +++ b/arch/arm/mach-imx/cpufreq.c @@ -22,7 +22,8 @@ #include #include #include -#include + +#include "hardware.h" #define CLK32_FREQ 32768 #define NANOSECOND (1000 * 1000 * 1000) diff --git a/arch/arm/mach-imx/devices/platform-ahci-imx.c b/arch/arm/mach-imx/devices/platform-ahci-imx.c index bf7f46d..3d87dd9 100644 --- a/arch/arm/mach-imx/devices/platform-ahci-imx.c +++ b/arch/arm/mach-imx/devices/platform-ahci-imx.c @@ -24,7 +24,8 @@ #include #include #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_ahci_imx_data_entry_single(soc, _devid) \ diff --git a/arch/arm/mach-imx/devices/platform-fec.c b/arch/arm/mach-imx/devices/platform-fec.c index e62114f..2cb188a 100644 --- a/arch/arm/mach-imx/devices/platform-fec.c +++ b/arch/arm/mach-imx/devices/platform-fec.c @@ -8,7 +8,8 @@ */ #include #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_fec_data_entry_single(soc, _devid) \ diff --git a/arch/arm/mach-imx/devices/platform-flexcan.c b/arch/arm/mach-imx/devices/platform-flexcan.c index e776d8e..1078bf0 100644 --- a/arch/arm/mach-imx/devices/platform-flexcan.c +++ b/arch/arm/mach-imx/devices/platform-flexcan.c @@ -5,7 +5,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_flexcan_data_entry_single(soc, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c index 6ecccf9..37e4439 100644 --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_fsl_usb2_udc_data_entry_single(soc) \ diff --git a/arch/arm/mach-imx/devices/platform-gpio_keys.c b/arch/arm/mach-imx/devices/platform-gpio_keys.c index 3f87279..4862825 100644 --- a/arch/arm/mach-imx/devices/platform-gpio_keys.c +++ b/arch/arm/mach-imx/devices/platform-gpio_keys.c @@ -16,7 +16,8 @@ * Boston, MA 02110-1301, USA. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" struct platform_device *__init imx_add_gpio_keys( diff --git a/arch/arm/mach-imx/devices/platform-imx-fb.c b/arch/arm/mach-imx/devices/platform-imx-fb.c index abea28b..10b0ed3 100644 --- a/arch/arm/mach-imx/devices/platform-imx-fb.c +++ b/arch/arm/mach-imx/devices/platform-imx-fb.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_imx_fb_data_entry_single(soc, _devid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imx-i2c.c b/arch/arm/mach-imx/devices/platform-imx-i2c.c index 4a701fc..d1cb34a 100644 --- a/arch/arm/mach-imx/devices/platform-imx-i2c.c +++ b/arch/arm/mach-imx/devices/platform-imx-i2c.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_imx_i2c_data_entry_single(soc, _devid, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imx-keypad.c b/arch/arm/mach-imx/devices/platform-imx-keypad.c index 371b1e6..8f22a4c 100644 --- a/arch/arm/mach-imx/devices/platform-imx-keypad.c +++ b/arch/arm/mach-imx/devices/platform-imx-keypad.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_imx_keypad_data_entry_single(soc, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imx-ssi.c b/arch/arm/mach-imx/devices/platform-imx-ssi.c index bf0c5e4..bfcb8f3 100644 --- a/arch/arm/mach-imx/devices/platform-imx-ssi.c +++ b/arch/arm/mach-imx/devices/platform-imx-ssi.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_imx_ssi_data_entry(soc, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imx-uart.c b/arch/arm/mach-imx/devices/platform-imx-uart.c index e6132f2..67bf866 100644 --- a/arch/arm/mach-imx/devices/platform-imx-uart.c +++ b/arch/arm/mach-imx/devices/platform-imx-uart.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_imx_uart_3irq_data_entry(soc, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imx2-wdt.c b/arch/arm/mach-imx/devices/platform-imx2-wdt.c index 729c191..ec75d64 100644 --- a/arch/arm/mach-imx/devices/platform-imx2-wdt.c +++ b/arch/arm/mach-imx/devices/platform-imx2-wdt.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_imx2_wdt_data_entry_single(soc, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imx21-hcd.c b/arch/arm/mach-imx/devices/platform-imx21-hcd.c index 18b9963..30c8161 100644 --- a/arch/arm/mach-imx/devices/platform-imx21-hcd.c +++ b/arch/arm/mach-imx/devices/platform-imx21-hcd.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_imx21_hcd_data_entry_single(soc) \ diff --git a/arch/arm/mach-imx/devices/platform-imx_udc.c b/arch/arm/mach-imx/devices/platform-imx_udc.c index 75aee0b..5ced7e4 100644 --- a/arch/arm/mach-imx/devices/platform-imx_udc.c +++ b/arch/arm/mach-imx/devices/platform-imx_udc.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_imx_udc_data_entry_single(soc, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-imxdi_rtc.c b/arch/arm/mach-imx/devices/platform-imxdi_rtc.c index e4b22eb..5bb490d 100644 --- a/arch/arm/mach-imx/devices/platform-imxdi_rtc.c +++ b/arch/arm/mach-imx/devices/platform-imxdi_rtc.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_imxdi_rtc_data_entry_single(soc) \ diff --git a/arch/arm/mach-imx/devices/platform-ipu-core.c b/arch/arm/mach-imx/devices/platform-ipu-core.c index dc0e837..fc4dd7c 100644 --- a/arch/arm/mach-imx/devices/platform-ipu-core.c +++ b/arch/arm/mach-imx/devices/platform-ipu-core.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_ipu_core_entry_single(soc) \ diff --git a/arch/arm/mach-imx/devices/platform-mx2-camera.c b/arch/arm/mach-imx/devices/platform-mx2-camera.c index b88877d..f491016 100644 --- a/arch/arm/mach-imx/devices/platform-mx2-camera.c +++ b/arch/arm/mach-imx/devices/platform-mx2-camera.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_mx2_camera_data_entry_single(soc, _devid) \ diff --git a/arch/arm/mach-imx/devices/platform-mxc-ehci.c b/arch/arm/mach-imx/devices/platform-mxc-ehci.c index 27c8171..5d4bbbf 100644 --- a/arch/arm/mach-imx/devices/platform-mxc-ehci.c +++ b/arch/arm/mach-imx/devices/platform-mxc-ehci.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_mxc_ehci_data_entry_single(soc, _id, hs) \ diff --git a/arch/arm/mach-imx/devices/platform-mxc-mmc.c b/arch/arm/mach-imx/devices/platform-mxc-mmc.c index 487f61c..7da19af 100644 --- a/arch/arm/mach-imx/devices/platform-mxc-mmc.c +++ b/arch/arm/mach-imx/devices/platform-mxc-mmc.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-mxc_nand.c b/arch/arm/mach-imx/devices/platform-mxc_nand.c index cec6961..6743b11 100644 --- a/arch/arm/mach-imx/devices/platform-mxc_nand.c +++ b/arch/arm/mach-imx/devices/platform-mxc_nand.c @@ -7,7 +7,8 @@ * Free Software Foundation. */ #include -#include + +#include "../hardware.h" #include "devices-common.h" #define imx_mxc_nand_data_entry_single(soc, _devid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-mxc_pwm.c b/arch/arm/mach-imx/devices/platform-mxc_pwm.c index a0551bf..dcd2897 100644 --- a/arch/arm/mach-imx/devices/platform-mxc_pwm.c +++ b/arch/arm/mach-imx/devices/platform-mxc_pwm.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-mxc_rnga.c b/arch/arm/mach-imx/devices/platform-mxc_rnga.c index 37bb23c..c58404b 100644 --- a/arch/arm/mach-imx/devices/platform-mxc_rnga.c +++ b/arch/arm/mach-imx/devices/platform-mxc_rnga.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" struct imx_mxc_rnga_data { diff --git a/arch/arm/mach-imx/devices/platform-mxc_rtc.c b/arch/arm/mach-imx/devices/platform-mxc_rtc.c index f35f848..c7fffaa 100644 --- a/arch/arm/mach-imx/devices/platform-mxc_rtc.c +++ b/arch/arm/mach-imx/devices/platform-mxc_rtc.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_mxc_rtc_data_entry_single(soc, _devid) \ diff --git a/arch/arm/mach-imx/devices/platform-mxc_w1.c b/arch/arm/mach-imx/devices/platform-mxc_w1.c index 5f972c6..88c18b7 100644 --- a/arch/arm/mach-imx/devices/platform-mxc_w1.c +++ b/arch/arm/mach-imx/devices/platform-mxc_w1.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_mxc_w1_data_entry_single(soc) \ diff --git a/arch/arm/mach-imx/devices/platform-pata_imx.c b/arch/arm/mach-imx/devices/platform-pata_imx.c index 3627ec8d..e4ec11c 100644 --- a/arch/arm/mach-imx/devices/platform-pata_imx.c +++ b/arch/arm/mach-imx/devices/platform-pata_imx.c @@ -3,7 +3,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_pata_imx_data_entry_single(soc, _size) \ diff --git a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c index 772ba2d..e66a4e3 100644 --- a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c +++ b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c @@ -6,8 +6,9 @@ * Free Software Foundation. */ -#include #include + +#include "../hardware.h" #include "devices-common.h" #define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \ diff --git a/arch/arm/mach-imx/devices/platform-spi_imx.c b/arch/arm/mach-imx/devices/platform-spi_imx.c index 63a116b..8880bcb 100644 --- a/arch/arm/mach-imx/devices/platform-spi_imx.c +++ b/arch/arm/mach-imx/devices/platform-spi_imx.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "../hardware.h" #include "devices-common.h" #define imx_spi_imx_data_entry_single(soc, type, _devid, _id, hwid, _size) \ diff --git a/arch/arm/mach-imx/ehci-imx25.c b/arch/arm/mach-imx/ehci-imx25.c index 412c583..27e40d1 100644 --- a/arch/arm/mach-imx/ehci-imx25.c +++ b/arch/arm/mach-imx/ehci-imx25.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX25_OTG_SIC_SHIFT 29 diff --git a/arch/arm/mach-imx/ehci-imx27.c b/arch/arm/mach-imx/ehci-imx27.c index cd6e1f8..448d911 100644 --- a/arch/arm/mach-imx/ehci-imx27.c +++ b/arch/arm/mach-imx/ehci-imx27.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX27_OTG_SIC_SHIFT 29 diff --git a/arch/arm/mach-imx/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c index 9a880c7..05de4e1 100644 --- a/arch/arm/mach-imx/ehci-imx31.c +++ b/arch/arm/mach-imx/ehci-imx31.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX31_OTG_SIC_SHIFT 29 diff --git a/arch/arm/mach-imx/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c index 779e16e..a596f70 100644 --- a/arch/arm/mach-imx/ehci-imx35.c +++ b/arch/arm/mach-imx/ehci-imx35.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX35_OTG_SIC_SHIFT 29 diff --git a/arch/arm/mach-imx/ehci-imx5.c b/arch/arm/mach-imx/ehci-imx5.c index cf8d00e..e49710b 100644 --- a/arch/arm/mach-imx/ehci-imx5.c +++ b/arch/arm/mach-imx/ehci-imx5.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define MXC_OTG_OFFSET 0 #define MXC_H1_OFFSET 0x200 #define MXC_H2_OFFSET 0x400 diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c index 76720f5..04a5961 100644 --- a/arch/arm/mach-imx/epit.c +++ b/arch/arm/mach-imx/epit.c @@ -51,11 +51,10 @@ #include #include #include - -#include #include #include "common.h" +#include "hardware.h" static struct clock_event_device clockevent_epit; static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index c29e2c5..b94cf41 100644 --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c @@ -29,10 +29,9 @@ #include -#include - #include "common.h" #include "devices-imx27.h" +#include "hardware.h" #include "iomux-mx27.h" static const int eukrea_mbimx27_pins[] __initconst = { diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index fd7112e..0c549b7 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c @@ -26,14 +26,14 @@ #include #include