diff options
77 files changed, 93 insertions, 77 deletions
diff --git a/arch/arm/mach-imx/avic.c b/arch/arm/mach-imx/avic.c index cbd55c36def3..204fd94c57d5 100644 --- a/arch/arm/mach-imx/avic.c +++ b/arch/arm/mach-imx/avic.c @@ -22,12 +22,12 @@ #include <linux/irqdomain.h> #include <linux/io.h> #include <linux/of.h> -#include <mach/common.h> #include <asm/mach/irq.h> #include <asm/exception.h> #include <mach/hardware.h> #include <mach/irqs.h> +#include "common.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 516ddee1948e..b5f90cc9e371 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c @@ -23,8 +23,9 @@ #include <linux/err.h> #include <mach/hardware.h> -#include <mach/common.h> + #include "clk.h" +#include "common.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 cf65148bc519..fbee6a4b1de1 100644 --- a/arch/arm/mach-imx/clk-imx21.c +++ b/arch/arm/mach-imx/clk-imx21.c @@ -26,8 +26,9 @@ #include <linux/err.h> #include <mach/hardware.h> -#include <mach/common.h> + #include "clk.h" +#include "common.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 d20d4795f4ea..08a143a19e63 100644 --- a/arch/arm/mach-imx/clk-imx25.c +++ b/arch/arm/mach-imx/clk-imx25.c @@ -25,9 +25,10 @@ #include <linux/err.h> #include <mach/hardware.h> -#include <mach/common.h> #include <mach/mx25.h> + #include "clk.h" +#include "common.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 3b6b640eed24..31010cb93c6d 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c @@ -6,9 +6,10 @@ #include <linux/clk-provider.h> #include <linux/of.h> -#include <mach/common.h> #include <mach/hardware.h> + #include "clk.h" +#include "common.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 1253af2d9971..a4c298acd04e 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -24,9 +24,9 @@ #include <mach/hardware.h> #include <mach/mx31.h> -#include <mach/common.h> #include "clk.h" +#include "common.h" #include "crmregs-imx3.h" static const char *mcu_main_sel[] = { "spll", "mpll", }; diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index 177259b523cd..ba26bf3ee933 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c @@ -15,10 +15,10 @@ #include <linux/err.h> #include <mach/hardware.h> -#include <mach/common.h> #include "crmregs-imx3.h" #include "clk.h" +#include "common.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 a0bf84803eac..024587cee620 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@ -15,10 +15,10 @@ #include <linux/err.h> #include <mach/hardware.h> -#include <mach/common.h> #include "crm-regs-imx5.h" #include "clk.h" +#include "common.h" /* Low-power Audio Playback Mode clock */ static const char *lp_apm_sel[] = { "osc", }; diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 3ec242f3341e..e5a82bb95b52 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -19,8 +19,9 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> -#include <mach/common.h> + #include "clk.h" +#include "common.h" #define CCGR0 0x68 #define CCGR1 0x6c diff --git a/arch/arm/mach-imx/clk-pllv1.c b/arch/arm/mach-imx/clk-pllv1.c index 02be73178912..02f9013d4992 100644 --- a/arch/arm/mach-imx/clk-pllv1.c +++ b/arch/arm/mach-imx/clk-pllv1.c @@ -4,10 +4,10 @@ #include <linux/slab.h> #include <linux/kernel.h> #include <linux/err.h> -#include <mach/common.h> #include <mach/hardware.h> #include "clk.h" +#include "common.h" /** * pll v1 diff --git a/arch/arm/mach-imx/include/mach/common.h b/arch/arm/mach-imx/common.h index ead901814c0d..ead901814c0d 100644 --- a/arch/arm/mach-imx/include/mach/common.h +++ b/arch/arm/mach-imx/common.h diff --git a/arch/arm/mach-imx/cpu-imx31.c b/arch/arm/mach-imx/cpu-imx31.c index 3f2345f0cdaf..9d3a91c96a53 100644 --- a/arch/arm/mach-imx/cpu-imx31.c +++ b/arch/arm/mach-imx/cpu-imx31.c @@ -13,7 +13,8 @@ #include <linux/io.h> #include <mach/hardware.h> #include <mach/iim.h> -#include <mach/common.h> + +#include "common.h" static int mx31_cpu_rev = -1; diff --git a/arch/arm/mach-imx/devices/devices.c b/arch/arm/mach-imx/devices/devices.c index 4d55a7a26e98..9301e07b6125 100644 --- a/arch/arm/mach-imx/devices/devices.c +++ b/arch/arm/mach-imx/devices/devices.c @@ -21,7 +21,6 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/platform_device.h> -#include <mach/common.h> struct device mxc_aips_bus = { .init_name = "mxc_aips", diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c index 88726f4dbbfa..76720f528b1c 100644 --- a/arch/arm/mach-imx/epit.c +++ b/arch/arm/mach-imx/epit.c @@ -54,7 +54,8 @@ #include <mach/hardware.h> #include <asm/mach/time.h> -#include <mach/common.h> + +#include "common.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 ad4ee83e8989..27b55702bda2 100644 --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c @@ -29,9 +29,9 @@ #include <asm/mach/arch.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index 19d7fa63c8e9..34e46dcfb6d4 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c @@ -27,11 +27,11 @@ #include <video/platform_lcd.h> #include <mach/hardware.h> -#include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/mx25.h> +#include "common.h" #include "devices-imx25.h" #include "iomux-mx25.h" diff --git a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c index b5733217c2e6..63a42f6f9c29 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c @@ -37,8 +37,8 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> +#include "common.h" #include "devices-imx35.h" #include "iomux-mx35.h" diff --git a/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c index 4c7e33d44a16..f1cf52193000 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c @@ -37,8 +37,8 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> +#include "common.h" #include "devices-imx51.h" #include "iomux-mx51.h" diff --git a/arch/arm/mach-imx/hotplug.c b/arch/arm/mach-imx/hotplug.c index b07b778dc9a8..3dec962b0770 100644 --- a/arch/arm/mach-imx/hotplug.c +++ b/arch/arm/mach-imx/hotplug.c @@ -13,7 +13,8 @@ #include <linux/errno.h> #include <asm/cacheflush.h> #include <asm/cp15.h> -#include <mach/common.h> + +#include "common.h" static inline void cpu_enter_lowpower(void) { diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c index e80d5235dac0..83c56fb46aa2 100644 --- a/arch/arm/mach-imx/imx27-dt.c +++ b/arch/arm/mach-imx/imx27-dt.c @@ -14,9 +14,10 @@ #include <linux/of_platform.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/mx27.h> +#include "common.h" + static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART1_BASE_ADDR, "imx21-uart.0", NULL), OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART2_BASE_ADDR, "imx21-uart.1", NULL), diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c index a68ba207b2b7..408afcc91f0f 100644 --- a/arch/arm/mach-imx/imx31-dt.c +++ b/arch/arm/mach-imx/imx31-dt.c @@ -14,9 +14,10 @@ #include <linux/of_platform.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/mx31.h> +#include "common.h" + static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR, "imx21-uart.0", NULL), diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c index f233b4bb2342..e105f12f1e6f 100644 --- a/arch/arm/mach-imx/imx51-dt.c +++ b/arch/arm/mach-imx/imx51-dt.c @@ -15,9 +15,10 @@ #include <linux/of_platform.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/mx51.h> +#include "common.h" + /* * Lookup table for attaching a specific name and platform_data pointer to * devices as they get created by of_platform_populate(). Ideally this table diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c index b24f4b63c452..a0b4c3fd2891 100644 --- a/arch/arm/mach-imx/mach-apf9328.c +++ b/arch/arm/mach-imx/mach-apf9328.c @@ -25,9 +25,9 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx1.h" #include "iomux-mx1.h" diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index d288b9afe1ad..d05b63fbeef1 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c @@ -48,9 +48,9 @@ #include <asm/memory.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/ulpi.h> +#include "common.h" #include "devices-imx31.h" #include "crmregs-imx3.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-bug.c b/arch/arm/mach-imx/mach-bug.c index 55b71d12cae4..b98e982918f0 100644 --- a/arch/arm/mach-imx/mach-bug.c +++ b/arch/arm/mach-imx/mach-bug.c @@ -20,12 +20,12 @@ #include <linux/platform_device.h> #include <mach/hardware.h> -#include <mach/common.h> #include <asm/mach/time.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 0a05eabbf74a..271528b1d9ab 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c @@ -34,10 +34,10 @@ #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> +#include "common.h" #include "devices-imx27.h" #include "eukrea-baseboards.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c index 132243b2b703..86d4ac90ea67 100644 --- a/arch/arm/mach-imx/mach-cpuimx35.c +++ b/arch/arm/mach-imx/mach-cpuimx35.c @@ -38,8 +38,8 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> +#include "common.h" #include "devices-imx35.h" #include "eukrea-baseboards.h" #include "iomux-mx35.h" diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c index 3c2ceeddcd89..58ad093d059b 100644 --- a/arch/arm/mach-imx/mach-cpuimx51sd.c +++ b/arch/arm/mach-imx/mach-cpuimx51sd.c @@ -26,7 +26,6 @@ #include <linux/spi/spi.h> #include <linux/can/platform/mcp251x.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/setup.h> @@ -34,6 +33,7 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "devices-imx51.h" #include "cpu_op-mx51.h" #include "eukrea-baseboards.h" diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c index 7dece3463a23..e754b0cbfd83 100644 --- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c +++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c @@ -33,9 +33,9 @@ #include <asm/mach/time.h> #include <asm/memory.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/mx25.h> +#include "common.h" #include "devices-imx25.h" #include "eukrea-baseboards.h" #include "iomux-mx25.h" diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index 64b2d5ad9ba5..ec33607ebb6e 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -40,9 +40,9 @@ #include <asm/mach/time.h> #include <asm/system_info.h> #include <asm/memblock.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-imx27ipcam.c b/arch/arm/mach-imx/mach-imx27ipcam.c index 4e2dcd3c1623..725a87fdf138 100644 --- a/arch/arm/mach-imx/mach-imx27ipcam.c +++ b/arch/arm/mach-imx/mach-imx27ipcam.c @@ -18,8 +18,8 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <mach/hardware.h> -#include <mach/common.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-imx27lite.c b/arch/arm/mach-imx/mach-imx27lite.c index 49be646d613d..ec4603011035 100644 --- a/arch/arm/mach-imx/mach-imx27lite.c +++ b/arch/arm/mach-imx/mach-imx27lite.c @@ -21,8 +21,8 @@ #include <asm/mach/time.h> #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c index 29711e95579f..aaa90a781b35 100644 --- a/arch/arm/mach-imx/mach-imx53.c +++ b/arch/arm/mach-imx/mach-imx53.c @@ -19,9 +19,10 @@ #include <linux/of_platform.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/mx53.h> +#include "common.h" + /* * Lookup table for attaching a specific name and platform_data pointer to * devices as they get created by of_platform_populate(). Ideally this table diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 47c91f7185d2..85657610b4bf 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -33,10 +33,10 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/system_misc.h> -#include <mach/common.h> #include <mach/cpuidle.h> #include <mach/hardware.h> +#include "common.h" void imx6q_restart(char mode, const char *cmd) { diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index 050791677de8..7b973dcba93e 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c @@ -36,9 +36,9 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c index e9e2401a62b6..8be62f3559b6 100644 --- a/arch/arm/mach-imx/mach-mx1ads.c +++ b/arch/arm/mach-imx/mach-mx1ads.c @@ -23,9 +23,9 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx1.h" #include "iomux-mx1.h" diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c index 0df370a4a0ce..99adc9f893d8 100644 --- a/arch/arm/mach-imx/mach-mx21ads.c +++ b/arch/arm/mach-imx/mach-mx21ads.c @@ -18,13 +18,13 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/physmap.h> #include <linux/gpio.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> +#include "common.h" #include "devices-imx21.h" #include "iomux-mx21.h" diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index 4e741c57d3cc..5a17dd66c05c 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c @@ -37,9 +37,9 @@ #include <asm/mach/time.h> #include <asm/memory.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/mx25.h> +#include "common.h" #include "devices-imx25.h" #include "iomux-mx25.h" diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 8a89555e7632..5f78bb2dc84c 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c @@ -37,10 +37,10 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <mach/hardware.h> -#include <mach/common.h> #include <mach/ulpi.h> #include "3ds_debugboard.h" +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index 50b5d0492558..beb281c250f6 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c @@ -21,13 +21,13 @@ #include <linux/mtd/physmap.h> #include <linux/i2c.h> #include <linux/irq.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index d38b696efdfb..ee6a3f300a1e 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c @@ -37,10 +37,10 @@ #include <asm/memory.h> #include <asm/mach/map.h> #include <asm/memblock.h> -#include <mach/common.h> #include <mach/ulpi.h> #include "3ds_debugboard.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c index 837839bb1597..deb89d2cc1bb 100644 --- a/arch/arm/mach-imx/mach-mx31ads.c +++ b/arch/arm/mach-imx/mach-mx31ads.c @@ -28,7 +28,6 @@ #include <asm/mach/time.h> #include <asm/memory.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 @@ -37,6 +36,7 @@ #include <linux/mfd/wm8350/pmic.h> #endif +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index ae2dc78edf17..15d26a0390d2 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c @@ -43,10 +43,10 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> #include <mach/ulpi.h> #include "board-mx31lilly.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index 7d80aa259015..ef8d28f6b29d 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c @@ -40,10 +40,10 @@ #include <asm/setup.h> #include <mach/hardware.h> -#include <mach/common.h> #include <mach/ulpi.h> #include "board-mx31lite.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index 6c2e058b9a74..955275bbbc8a 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c @@ -42,12 +42,12 @@ #include <asm/mach/time.h> #include <asm/mach/map.h> #include <asm/memblock.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> #include <linux/platform_data/asoc-imx-ssi.h> #include "board-mx31moboard.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index 63d7a76165a4..ee7d0375c70d 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c @@ -44,12 +44,12 @@ #include <asm/memblock.h> #include <mach/hardware.h> -#include <mach/common.h> #include <video/platform_lcd.h> #include <media/soc_camera.h> #include "3ds_debugboard.h" +#include "common.h" #include "devices-imx35.h" #include "iomux-mx35.h" diff --git a/arch/arm/mach-imx/mach-mx50_rdp.c b/arch/arm/mach-imx/mach-mx50_rdp.c index 4762a3f80933..4a3e98e37797 100644 --- a/arch/arm/mach-imx/mach-mx50_rdp.c +++ b/arch/arm/mach-imx/mach-mx50_rdp.c @@ -24,7 +24,6 @@ #include <linux/delay.h> #include <linux/io.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/irq.h> @@ -33,6 +32,7 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "devices-imx50.h" #include "iomux-mx50.h" diff --git a/arch/arm/mach-imx/mach-mx51_3ds.c b/arch/arm/mach-imx/mach-mx51_3ds.c index 4eb4299836f3..476c759216bd 100644 --- a/arch/arm/mach-imx/mach-mx51_3ds.c +++ b/arch/arm/mach-imx/mach-mx51_3ds.c @@ -20,9 +20,9 @@ #include <asm/mach/time.h> #include <mach/hardware.h> -#include <mach/common.h> #include "3ds_debugboard.h" +#include "common.h" #include "devices-imx51.h" #include "iomux-mx51.h" diff --git a/arch/arm/mach-imx/mach-mx51_babbage.c b/arch/arm/mach-imx/mach-mx51_babbage.c index 20e6b9ef8c27..383948a17179 100644 --- a/arch/arm/mach-imx/mach-mx51_babbage.c +++ b/arch/arm/mach-imx/mach-mx51_babbage.c @@ -20,7 +20,6 @@ #include <linux/spi/flash.h> #include <linux/spi/spi.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/setup.h> @@ -28,6 +27,7 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> +#include "common.h" #include "devices-imx51.h" #include "cpu_op-mx51.h" #include "iomux-mx51.h" diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c index b5c036ac64a1..f1cbe03a4462 100644 --- a/arch/arm/mach-imx/mach-mxt_td60.c +++ b/arch/arm/mach-imx/mach-mxt_td60.c @@ -21,7 +21,6 @@ #include <linux/mtd/physmap.h> #include <linux/i2c.h> #include <linux/irq.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -30,6 +29,7 @@ #include <linux/gpio.h> #include <linux/i2c/pca953x.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 42f407b21d5c..826d326bdcd2 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c @@ -32,11 +32,11 @@ #include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <mach/common.h> #include <mach/hardware.h> #include <asm/mach/time.h> #include <mach/ulpi.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c index 0bdec552f7d9..59d227470d52 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c @@ -42,10 +42,10 @@ #include <asm/mach/time.h> #include <asm/mach/map.h> #include <asm/memblock.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" #include "pcm037.h" diff --git a/arch/arm/mach-imx/mach-pcm037_eet.c b/arch/arm/mach-imx/mach-pcm037_eet.c index 727dd6391201..8fd8255068ee 100644 --- a/arch/arm/mach-imx/mach-pcm037_eet.c +++ b/arch/arm/mach-imx/mach-pcm037_eet.c @@ -11,11 +11,10 @@ #include <linux/platform_device.h> #include <linux/spi/spi.h> -#include <mach/common.h> - #include <asm/mach-types.h> #include "pcm037.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 288838c166a3..9ebc248791ef 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c @@ -33,11 +33,11 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> #include "board-pcm038.h" +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index 051e8830e752..285ac8bbb609 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c @@ -34,9 +34,9 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> #include <mach/ulpi.h> +#include "common.h" #include "devices-imx35.h" #include "iomux-mx35.h" diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c index c85425fb9879..962988a8cfaa 100644 --- a/arch/arm/mach-imx/mach-qong.c +++ b/arch/arm/mach-imx/mach-qong.c @@ -26,10 +26,10 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <asm/page.h> #include <asm/setup.h> +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mach-scb9328.c b/arch/arm/mach-imx/mach-scb9328.c index 7528bb2d382a..c4917565871e 100644 --- a/arch/arm/mach-imx/mach-scb9328.c +++ b/arch/arm/mach-imx/mach-scb9328.c @@ -20,9 +20,9 @@ #include <asm/mach/arch.h> #include <asm/mach/time.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx1.h" #include "iomux-mx1.h" diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c index 37fff6188a24..288a920ad648 100644 --- a/arch/arm/mach-imx/mach-vpr200.c +++ b/arch/arm/mach-imx/mach-vpr200.c @@ -29,12 +29,12 @@ #include <asm/mach/time.h> #include <mach/hardware.h> -#include <mach/common.h> #include <linux/i2c.h> #include <linux/i2c/at24.h> #include <linux/mfd/mc13xxx.h> +#include "common.h" #include "devices-imx35.h" #include "iomux-mx35.h" diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c index af612429b443..118aa928cd8b 100644 --- a/arch/arm/mach-imx/mm-imx1.c +++ b/arch/arm/mach-imx/mm-imx1.c @@ -22,9 +22,9 @@ #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "iomux-v1.h" static struct map_desc imx_io_desc[] __initdata = { diff --git a/arch/arm/mach-imx/mm-imx21.c b/arch/arm/mach-imx/mm-imx21.c index 79d94aaa0640..0c24556f299b 100644 --- a/arch/arm/mach-imx/mm-imx21.c +++ b/arch/arm/mach-imx/mm-imx21.c @@ -22,10 +22,10 @@ #include <linux/init.h> #include <linux/pinctrl/machine.h> #include <mach/hardware.h> -#include <mach/common.h> #include <asm/pgtable.h> #include <asm/mach/map.h> +#include "common.h" #include "devices/devices-common.h" #include "iomux-v1.h" diff --git a/arch/arm/mach-imx/mm-imx25.c b/arch/arm/mach-imx/mm-imx25.c index c8ea3aaf4323..a08a960de238 100644 --- a/arch/arm/mach-imx/mm-imx25.c +++ b/arch/arm/mach-imx/mm-imx25.c @@ -24,10 +24,10 @@ #include <asm/pgtable.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/mx25.h> +#include "common.h" #include "devices/devices-common.h" #include "iomux-v3.h" diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c index 6d91808a0445..3241314b4f2f 100644 --- a/arch/arm/mach-imx/mm-imx27.c +++ b/arch/arm/mach-imx/mm-imx27.c @@ -22,10 +22,10 @@ #include <linux/init.h> #include <linux/pinctrl/machine.h> #include <mach/hardware.h> -#include <mach/common.h> #include <asm/pgtable.h> #include <asm/mach/map.h> +#include "common.h" #include "devices/devices-common.h" #include "iomux-v1.h" diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index 6a5d4e496f8c..3e2ed2ab1eaf 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c @@ -26,9 +26,9 @@ #include <asm/hardware/cache-l2x0.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "crmregs-imx3.h" #include "devices/devices-common.h" #include "iomux-v3.h" diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c index cc1423c0cce8..d9ef24b2260b 100644 --- a/arch/arm/mach-imx/mm-imx5.c +++ b/arch/arm/mach-imx/mm-imx5.c @@ -19,8 +19,8 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> +#include "common.h" #include "devices/devices-common.h" #include "iomux-v3.h" diff --git a/arch/arm/mach-imx/mx31lilly-db.c b/arch/arm/mach-imx/mx31lilly-db.c index d364d52dfff3..8cdcf0f2522d 100644 --- a/arch/arm/mach-imx/mx31lilly-db.c +++ b/arch/arm/mach-imx/mx31lilly-db.c @@ -31,9 +31,9 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> #include "board-mx31lilly.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mx31lite-db.c b/arch/arm/mach-imx/mx31lite-db.c index 944f7a83b34e..c9eb91c344b1 100644 --- a/arch/arm/mach-imx/mx31lite-db.c +++ b/arch/arm/mach-imx/mx31lite-db.c @@ -32,9 +32,9 @@ #include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/common.h> #include "board-mx31lite.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c index 3dfb344db10a..527f1739b0a7 100644 --- a/arch/arm/mach-imx/mx31moboard-devboard.c +++ b/arch/arm/mach-imx/mx31moboard-devboard.c @@ -22,10 +22,10 @@ #include <linux/usb/otg.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index 21cb93e347b2..4679309c2ab9 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c @@ -24,12 +24,12 @@ #include <linux/usb/otg.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> #include <media/soc_camera.h> +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c index 318be44ee34f..afb4d054fb08 100644 --- a/arch/arm/mach-imx/mx31moboard-smartbot.c +++ b/arch/arm/mach-imx/mx31moboard-smartbot.c @@ -23,13 +23,13 @@ #include <linux/usb/otg.h> #include <linux/usb/ulpi.h> -#include <mach/common.h> #include <mach/hardware.h> #include <mach/ulpi.h> #include <media/soc_camera.h> #include "board-mx31moboard.h" +#include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" diff --git a/arch/arm/mach-imx/pcm970-baseboard.c b/arch/arm/mach-imx/pcm970-baseboard.c index 8e4580733018..c491f59e7294 100644 --- a/arch/arm/mach-imx/pcm970-baseboard.c +++ b/arch/arm/mach-imx/pcm970-baseboard.c @@ -23,9 +23,9 @@ #include <asm/mach/arch.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c index 2ac43e1a2dfd..6147be27af41 100644 --- a/arch/arm/mach-imx/platsmp.c +++ b/arch/arm/mach-imx/platsmp.c @@ -16,9 +16,10 @@ #include <asm/smp_scu.h> #include <asm/hardware/gic.h> #include <asm/mach/map.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" + static void __iomem *scu_base; static struct map_desc scu_io_desc __initdata = { diff --git a/arch/arm/mach-imx/pm-imx3.c b/arch/arm/mach-imx/pm-imx3.c index 884dc9453d30..e509be04c92a 100644 --- a/arch/arm/mach-imx/pm-imx3.c +++ b/arch/arm/mach-imx/pm-imx3.c @@ -9,8 +9,9 @@ * http://www.gnu.org/copyleft/gpl.html */ #include <linux/io.h> -#include <mach/common.h> #include <mach/hardware.h> + +#include "common.h" #include "crmregs-imx3.h" #include "devices/devices-common.h" diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c index 19621ed1ffa5..9fead8c4ea9d 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c @@ -16,9 +16,10 @@ #include <asm/cacheflush.h> #include <asm/system_misc.h> #include <asm/tlbflush.h> -#include <mach/common.h> #include <mach/cpuidle.h> #include <mach/hardware.h> + +#include "common.h" #include "crm-regs-imx5.h" /* diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index f7b0c2b1b905..05618afb5596 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c @@ -18,9 +18,10 @@ #include <asm/proc-fns.h> #include <asm/suspend.h> #include <asm/hardware/cache-l2x0.h> -#include <mach/common.h> #include <mach/hardware.h> +#include "common.h" + extern unsigned long phys_l2x0_saved_regs; static int imx6q_suspend_finish(unsigned long val) diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index 3da78cfc5a94..bbd80f25cdc4 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -23,11 +23,12 @@ #include <linux/delay.h> #include <mach/hardware.h> -#include <mach/common.h> #include <asm/system_misc.h> #include <asm/proc-fns.h> #include <asm/mach-types.h> +#include "common.h" + static void __iomem *wdog_base; /* diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index a17abcf98325..8ee6f3608a85 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -30,7 +30,8 @@ #include <mach/hardware.h> #include <asm/sched_clock.h> #include <asm/mach/time.h> -#include <mach/common.h> + +#include "common.h" /* * There are 2 versions of the timer hardware on Freescale MXC hardware. diff --git a/arch/arm/mach-imx/tzic.c b/arch/arm/mach-imx/tzic.c index 3ed1adbc09f8..6134e962da14 100644 --- a/arch/arm/mach-imx/tzic.c +++ b/arch/arm/mach-imx/tzic.c @@ -22,9 +22,9 @@ #include <asm/exception.h> #include <mach/hardware.h> -#include <mach/common.h> #include <mach/irqs.h> +#include "common.h" #include "irq-common.h" /* |