diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 09:01:00 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:03:10 -0400 |
commit | e3372474cfa0dc016f10ec47baddbd1ed0abecf3 (patch) | |
tree | ff239d4f665a9c30158f554600c463433e474a05 | |
parent | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (diff) |
ARM: imx: include common.h rather than mach/common.h
Rename mach-imx/include/mach/common.h to mach-imx/common.h and update
all users to include common.h rather than mach/common.h.
It also removes an unneeded inclusion to common.h in
mach-imx/devices/devices.c.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
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 @@ | |||
22 | #include <linux/irqdomain.h> | 22 | #include <linux/irqdomain.h> |
23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
24 | #include <linux/of.h> | 24 | #include <linux/of.h> |
25 | #include <mach/common.h> | ||
26 | #include <asm/mach/irq.h> | 25 | #include <asm/mach/irq.h> |
27 | #include <asm/exception.h> | 26 | #include <asm/exception.h> |
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | #include <mach/irqs.h> | 28 | #include <mach/irqs.h> |
30 | 29 | ||
30 | #include "common.h" | ||
31 | #include "irq-common.h" | 31 | #include "irq-common.h" |
32 | 32 | ||
33 | #define AVIC_INTCNTL 0x00 /* int control reg */ | 33 | #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 @@ | |||
23 | #include <linux/err.h> | 23 | #include <linux/err.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/common.h> | 26 | |
27 | #include "clk.h" | 27 | #include "clk.h" |
28 | #include "common.h" | ||
28 | 29 | ||
29 | /* CCM register addresses */ | 30 | /* CCM register addresses */ |
30 | #define IO_ADDR_CCM(off) (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off))) | 31 | #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 @@ | |||
26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
27 | 27 | ||
28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <mach/common.h> | 29 | |
30 | #include "clk.h" | 30 | #include "clk.h" |
31 | #include "common.h" | ||
31 | 32 | ||
32 | #define IO_ADDR_CCM(off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off))) | 33 | #define IO_ADDR_CCM(off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off))) |
33 | 34 | ||
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 @@ | |||
25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
26 | 26 | ||
27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <mach/common.h> | ||
29 | #include <mach/mx25.h> | 28 | #include <mach/mx25.h> |
29 | |||
30 | #include "clk.h" | 30 | #include "clk.h" |
31 | #include "common.h" | ||
31 | 32 | ||
32 | #define CRM_BASE MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR) | 33 | #define CRM_BASE MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR) |
33 | 34 | ||
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 @@ | |||
6 | #include <linux/clk-provider.h> | 6 | #include <linux/clk-provider.h> |
7 | #include <linux/of.h> | 7 | #include <linux/of.h> |
8 | 8 | ||
9 | #include <mach/common.h> | ||
10 | #include <mach/hardware.h> | 9 | #include <mach/hardware.h> |
10 | |||
11 | #include "clk.h" | 11 | #include "clk.h" |
12 | #include "common.h" | ||
12 | 13 | ||
13 | #define IO_ADDR_CCM(off) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off))) | 14 | #define IO_ADDR_CCM(off) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off))) |
14 | 15 | ||
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 @@ | |||
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/mx31.h> | 26 | #include <mach/mx31.h> |
27 | #include <mach/common.h> | ||
28 | 27 | ||
29 | #include "clk.h" | 28 | #include "clk.h" |
29 | #include "common.h" | ||
30 | #include "crmregs-imx3.h" | 30 | #include "crmregs-imx3.h" |
31 | 31 | ||
32 | static const char *mcu_main_sel[] = { "spll", "mpll", }; | 32 | 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 @@ | |||
15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
16 | 16 | ||
17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
18 | #include <mach/common.h> | ||
19 | 18 | ||
20 | #include "crmregs-imx3.h" | 19 | #include "crmregs-imx3.h" |
21 | #include "clk.h" | 20 | #include "clk.h" |
21 | #include "common.h" | ||
22 | 22 | ||
23 | struct arm_ahb_div { | 23 | struct arm_ahb_div { |
24 | unsigned char arm, ahb, sel; | 24 | 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 @@ | |||
15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
16 | 16 | ||
17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
18 | #include <mach/common.h> | ||
19 | 18 | ||
20 | #include "crm-regs-imx5.h" | 19 | #include "crm-regs-imx5.h" |
21 | #include "clk.h" | 20 | #include "clk.h" |
21 | #include "common.h" | ||
22 | 22 | ||
23 | /* Low-power Audio Playback Mode clock */ | 23 | /* Low-power Audio Playback Mode clock */ |
24 | static const char *lp_apm_sel[] = { "osc", }; | 24 | 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 @@ | |||
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/of_address.h> | 20 | #include <linux/of_address.h> |
21 | #include <linux/of_irq.h> | 21 | #include <linux/of_irq.h> |
22 | #include <mach/common.h> | 22 | |
23 | #include "clk.h" | 23 | #include "clk.h" |
24 | #include "common.h" | ||
24 | 25 | ||
25 | #define CCGR0 0x68 | 26 | #define CCGR0 0x68 |
26 | #define CCGR1 0x6c | 27 | #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 @@ | |||
4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
5 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
6 | #include <linux/err.h> | 6 | #include <linux/err.h> |
7 | #include <mach/common.h> | ||
8 | #include <mach/hardware.h> | 7 | #include <mach/hardware.h> |
9 | 8 | ||
10 | #include "clk.h" | 9 | #include "clk.h" |
10 | #include "common.h" | ||
11 | 11 | ||
12 | /** | 12 | /** |
13 | * pll v1 | 13 | * 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 @@ | |||
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <mach/hardware.h> | 14 | #include <mach/hardware.h> |
15 | #include <mach/iim.h> | 15 | #include <mach/iim.h> |
16 | #include <mach/common.h> | 16 | |
17 | #include "common.h" | ||
17 | 18 | ||
18 | static int mx31_cpu_rev = -1; | 19 | static int mx31_cpu_rev = -1; |
19 | 20 | ||
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 @@ | |||
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <mach/common.h> | ||
25 | 24 | ||
26 | struct device mxc_aips_bus = { | 25 | struct device mxc_aips_bus = { |
27 | .init_name = "mxc_aips", | 26 | .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 @@ | |||
54 | 54 | ||
55 | #include <mach/hardware.h> | 55 | #include <mach/hardware.h> |
56 | #include <asm/mach/time.h> | 56 | #include <asm/mach/time.h> |
57 | #include <mach/common.h> | 57 | |
58 | #include "common.h" | ||
58 | 59 | ||
59 | static struct clock_event_device clockevent_epit; | 60 | static struct clock_event_device clockevent_epit; |
60 | static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; | 61 | 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 @@ | |||
29 | 29 | ||
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | 31 | ||
32 | #include <mach/common.h> | ||
33 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
34 | 33 | ||
34 | #include "common.h" | ||
35 | #include "devices-imx27.h" | 35 | #include "devices-imx27.h" |
36 | #include "iomux-mx27.h" | 36 | #include "iomux-mx27.h" |
37 | 37 | ||
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 @@ | |||
27 | #include <video/platform_lcd.h> | 27 | #include <video/platform_lcd.h> |
28 | 28 | ||
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <mach/common.h> | ||
31 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
32 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
33 | #include <mach/mx25.h> | 32 | #include <mach/mx25.h> |
34 | 33 | ||
34 | #include "common.h" | ||
35 | #include "devices-imx25.h" | 35 | #include "devices-imx25.h" |
36 | #include "iomux-mx25.h" | 36 | #include "iomux-mx25.h" |
37 | 37 | ||
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 @@ | |||
37 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
38 | 38 | ||
39 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
40 | #include <mach/common.h> | ||
41 | 40 | ||
41 | #include "common.h" | ||
42 | #include "devices-imx35.h" | 42 | #include "devices-imx35.h" |
43 | #include "iomux-mx35.h" | 43 | #include "iomux-mx35.h" |
44 | 44 | ||
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 @@ | |||
37 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
38 | 38 | ||
39 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
40 | #include <mach/common.h> | ||
41 | 40 | ||
41 | #include "common.h" | ||
42 | #include "devices-imx51.h" | 42 | #include "devices-imx51.h" |
43 | #include "iomux-mx51.h" | 43 | #include "iomux-mx51.h" |
44 | 44 | ||
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 @@ | |||
13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
14 | #include <asm/cacheflush.h> | 14 | #include <asm/cacheflush.h> |
15 | #include <asm/cp15.h> | 15 | #include <asm/cp15.h> |
16 | #include <mach/common.h> | 16 | |
17 | #include "common.h" | ||
17 | 18 | ||
18 | static inline void cpu_enter_lowpower(void) | 19 | static inline void cpu_enter_lowpower(void) |
19 | { | 20 | { |
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 @@ | |||
14 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
15 | #include <asm/mach/arch.h> | 15 | #include <asm/mach/arch.h> |
16 | #include <asm/mach/time.h> | 16 | #include <asm/mach/time.h> |
17 | #include <mach/common.h> | ||
18 | #include <mach/mx27.h> | 17 | #include <mach/mx27.h> |
19 | 18 | ||
19 | #include "common.h" | ||
20 | |||
20 | static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = { | 21 | static const struct of_dev_auxdata imx27_auxdata_lookup[] __initconst = { |
21 | OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART1_BASE_ADDR, "imx21-uart.0", NULL), | 22 | OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART1_BASE_ADDR, "imx21-uart.0", NULL), |
22 | OF_DEV_AUXDATA("fsl,imx27-uart", MX27_UART2_BASE_ADDR, "imx21-uart.1", NULL), | 23 | 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 @@ | |||
14 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
15 | #include <asm/mach/arch.h> | 15 | #include <asm/mach/arch.h> |
16 | #include <asm/mach/time.h> | 16 | #include <asm/mach/time.h> |
17 | #include <mach/common.h> | ||
18 | #include <mach/mx31.h> | 17 | #include <mach/mx31.h> |
19 | 18 | ||
19 | #include "common.h" | ||
20 | |||
20 | static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = { | 21 | static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = { |
21 | OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR, | 22 | OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR, |
22 | "imx21-uart.0", NULL), | 23 | "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 @@ | |||
15 | #include <linux/of_platform.h> | 15 | #include <linux/of_platform.h> |
16 | #include <asm/mach/arch.h> | 16 | #include <asm/mach/arch.h> |
17 | #include <asm/mach/time.h> | 17 | #include <asm/mach/time.h> |
18 | #include <mach/common.h> | ||
19 | #include <mach/mx51.h> | 18 | #include <mach/mx51.h> |
20 | 19 | ||
20 | #include "common.h" | ||
21 | |||
21 | /* | 22 | /* |
22 | * Lookup table for attaching a specific name and platform_data pointer to | 23 | * Lookup table for attaching a specific name and platform_data pointer to |
23 | * devices as they get created by of_platform_populate(). Ideally this table | 24 | * 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 @@ | |||
25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
26 | #include <asm/mach/time.h> | 26 | #include <asm/mach/time.h> |
27 | 27 | ||
28 | #include <mach/common.h> | ||
29 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
30 | 29 | ||
30 | #include "common.h" | ||
31 | #include "devices-imx1.h" | 31 | #include "devices-imx1.h" |
32 | #include "iomux-mx1.h" | 32 | #include "iomux-mx1.h" |
33 | 33 | ||
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 @@ | |||
48 | #include <asm/memory.h> | 48 | #include <asm/memory.h> |
49 | #include <asm/mach/map.h> | 49 | #include <asm/mach/map.h> |
50 | 50 | ||
51 | #include <mach/common.h> | ||
52 | #include <mach/ulpi.h> | 51 | #include <mach/ulpi.h> |
53 | 52 | ||
53 | #include "common.h" | ||
54 | #include "devices-imx31.h" | 54 | #include "devices-imx31.h" |
55 | #include "crmregs-imx3.h" | 55 | #include "crmregs-imx3.h" |
56 | #include "iomux-mx3.h" | 56 | #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 @@ | |||
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | 21 | ||
22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
23 | #include <mach/common.h> | ||
24 | 23 | ||
25 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
26 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
27 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
28 | 27 | ||
28 | #include "common.h" | ||
29 | #include "devices-imx31.h" | 29 | #include "devices-imx31.h" |
30 | #include "iomux-mx3.h" | 30 | #include "iomux-mx3.h" |
31 | 31 | ||
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 @@ | |||
34 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
36 | 36 | ||
37 | #include <mach/common.h> | ||
38 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
39 | #include <mach/ulpi.h> | 38 | #include <mach/ulpi.h> |
40 | 39 | ||
40 | #include "common.h" | ||
41 | #include "devices-imx27.h" | 41 | #include "devices-imx27.h" |
42 | #include "eukrea-baseboards.h" | 42 | #include "eukrea-baseboards.h" |
43 | #include "iomux-mx27.h" | 43 | #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 @@ | |||
38 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
39 | 39 | ||
40 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
41 | #include <mach/common.h> | ||
42 | 41 | ||
42 | #include "common.h" | ||
43 | #include "devices-imx35.h" | 43 | #include "devices-imx35.h" |
44 | #include "eukrea-baseboards.h" | 44 | #include "eukrea-baseboards.h" |
45 | #include "iomux-mx35.h" | 45 | #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 @@ | |||
26 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
27 | #include <linux/can/platform/mcp251x.h> | 27 | #include <linux/can/platform/mcp251x.h> |
28 | 28 | ||
29 | #include <mach/common.h> | ||
30 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
31 | 30 | ||
32 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
@@ -34,6 +33,7 @@ | |||
34 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
35 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
36 | 35 | ||
36 | #include "common.h" | ||
37 | #include "devices-imx51.h" | 37 | #include "devices-imx51.h" |
38 | #include "cpu_op-mx51.h" | 38 | #include "cpu_op-mx51.h" |
39 | #include "eukrea-baseboards.h" | 39 | #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 @@ | |||
33 | #include <asm/mach/time.h> | 33 | #include <asm/mach/time.h> |
34 | #include <asm/memory.h> | 34 | #include <asm/memory.h> |
35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
36 | #include <mach/common.h> | ||
37 | #include <mach/mx25.h> | 36 | #include <mach/mx25.h> |
38 | 37 | ||
38 | #include "common.h" | ||
39 | #include "devices-imx25.h" | 39 | #include "devices-imx25.h" |
40 | #include "eukrea-baseboards.h" | 40 | #include "eukrea-baseboards.h" |
41 | #include "iomux-mx25.h" | 41 | #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 @@ | |||
40 | #include <asm/mach/time.h> | 40 | #include <asm/mach/time.h> |
41 | #include <asm/system_info.h> | 41 | #include <asm/system_info.h> |
42 | #include <asm/memblock.h> | 42 | #include <asm/memblock.h> |
43 | #include <mach/common.h> | ||
44 | #include <mach/hardware.h> | 43 | #include <mach/hardware.h> |
45 | 44 | ||
45 | #include "common.h" | ||
46 | #include "devices-imx27.h" | 46 | #include "devices-imx27.h" |
47 | #include "iomux-mx27.h" | 47 | #include "iomux-mx27.h" |
48 | 48 | ||
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 @@ | |||
18 | #include <asm/mach/arch.h> | 18 | #include <asm/mach/arch.h> |
19 | #include <asm/mach/time.h> | 19 | #include <asm/mach/time.h> |
20 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
21 | #include <mach/common.h> | ||
22 | 21 | ||
22 | #include "common.h" | ||
23 | #include "devices-imx27.h" | 23 | #include "devices-imx27.h" |
24 | #include "iomux-mx27.h" | 24 | #include "iomux-mx27.h" |
25 | 25 | ||
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 @@ | |||
21 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
22 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/common.h> | ||
25 | 24 | ||
25 | #include "common.h" | ||
26 | #include "devices-imx27.h" | 26 | #include "devices-imx27.h" |
27 | #include "iomux-mx27.h" | 27 | #include "iomux-mx27.h" |
28 | 28 | ||
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 @@ | |||
19 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
20 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
21 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
22 | #include <mach/common.h> | ||
23 | #include <mach/mx53.h> | 22 | #include <mach/mx53.h> |
24 | 23 | ||
24 | #include "common.h" | ||
25 | |||
25 | /* | 26 | /* |
26 | * Lookup table for attaching a specific name and platform_data pointer to | 27 | * Lookup table for attaching a specific name and platform_data pointer to |
27 | * devices as they get created by of_platform_populate(). Ideally this table | 28 | * 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 @@ | |||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
35 | #include <asm/system_misc.h> | 35 | #include <asm/system_misc.h> |
36 | #include <mach/common.h> | ||
37 | #include <mach/cpuidle.h> | 36 | #include <mach/cpuidle.h> |
38 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
39 | 38 | ||
39 | #include "common.h" | ||
40 | 40 | ||
41 | void imx6q_restart(char mode, const char *cmd) | 41 | void imx6q_restart(char mode, const char *cmd) |
42 | { | 42 | { |
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 @@ | |||
36 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
37 | #include <asm/mach/time.h> | 37 | #include <asm/mach/time.h> |
38 | 38 | ||
39 | #include <mach/common.h> | ||
40 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
41 | 40 | ||
41 | #include "common.h" | ||
42 | #include "devices-imx31.h" | 42 | #include "devices-imx31.h" |
43 | #include "iomux-mx3.h" | 43 | #include "iomux-mx3.h" |
44 | 44 | ||
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 @@ | |||
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
25 | 25 | ||
26 | #include <mach/common.h> | ||
27 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
28 | 27 | ||
28 | #include "common.h" | ||
29 | #include "devices-imx1.h" | 29 | #include "devices-imx1.h" |
30 | #include "iomux-mx1.h" | 30 | #include "iomux-mx1.h" |
31 | 31 | ||
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 @@ | |||
18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
21 | #include <mach/common.h> | ||
22 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
23 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
24 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
25 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
26 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
27 | 26 | ||
27 | #include "common.h" | ||
28 | #include "devices-imx21.h" | 28 | #include "devices-imx21.h" |
29 | #include "iomux-mx21.h" | 29 | #include "iomux-mx21.h" |
30 | 30 | ||
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 @@ | |||
37 | #include <asm/mach/time.h> | 37 | #include <asm/mach/time.h> |
38 | #include <asm/memory.h> | 38 | #include <asm/memory.h> |
39 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
40 | #include <mach/common.h> | ||
41 | #include <mach/mx25.h> | 40 | #include <mach/mx25.h> |
42 | 41 | ||
42 | #include "common.h" | ||
43 | #include "devices-imx25.h" | 43 | #include "devices-imx25.h" |
44 | #include "iomux-mx25.h" | 44 | #include "iomux-mx25.h" |
45 | 45 | ||
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 @@ | |||
37 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
40 | #include <mach/common.h> | ||
41 | #include <mach/ulpi.h> | 40 | #include <mach/ulpi.h> |
42 | 41 | ||
43 | #include "3ds_debugboard.h" | 42 | #include "3ds_debugboard.h" |
43 | #include "common.h" | ||
44 | #include "devices-imx27.h" | 44 | #include "devices-imx27.h" |
45 | #include "iomux-mx27.h" | 45 | #include "iomux-mx27.h" |
46 | 46 | ||
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 @@ | |||
21 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
22 | #include <linux/i2c.h> | 22 | #include <linux/i2c.h> |
23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
24 | #include <mach/common.h> | ||
25 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
28 | #include <asm/mach/time.h> | 27 | #include <asm/mach/time.h> |
29 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
30 | 29 | ||
30 | #include "common.h" | ||
31 | #include "devices-imx27.h" | 31 | #include "devices-imx27.h" |
32 | #include "iomux-mx27.h" | 32 | #include "iomux-mx27.h" |
33 | 33 | ||
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 @@ | |||
37 | #include <asm/memory.h> | 37 | #include <asm/memory.h> |
38 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
39 | #include <asm/memblock.h> | 39 | #include <asm/memblock.h> |
40 | #include <mach/common.h> | ||
41 | #include <mach/ulpi.h> | 40 | #include <mach/ulpi.h> |
42 | 41 | ||
43 | #include "3ds_debugboard.h" | 42 | #include "3ds_debugboard.h" |
43 | #include "common.h" | ||
44 | #include "devices-imx31.h" | 44 | #include "devices-imx31.h" |
45 | #include "iomux-mx3.h" | 45 | #include "iomux-mx3.h" |
46 | 46 | ||
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 @@ | |||
28 | #include <asm/mach/time.h> | 28 | #include <asm/mach/time.h> |
29 | #include <asm/memory.h> | 29 | #include <asm/memory.h> |
30 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
31 | #include <mach/common.h> | ||
32 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
33 | 32 | ||
34 | #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 | 33 | #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1 |
@@ -37,6 +36,7 @@ | |||
37 | #include <linux/mfd/wm8350/pmic.h> | 36 | #include <linux/mfd/wm8350/pmic.h> |
38 | #endif | 37 | #endif |
39 | 38 | ||
39 | #include "common.h" | ||
40 | #include "devices-imx31.h" | 40 | #include "devices-imx31.h" |
41 | #include "iomux-mx3.h" | 41 | #include "iomux-mx3.h" |
42 | 42 | ||
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 @@ | |||
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | 44 | ||
45 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
46 | #include <mach/common.h> | ||
47 | #include <mach/ulpi.h> | 46 | #include <mach/ulpi.h> |
48 | 47 | ||
49 | #include "board-mx31lilly.h" | 48 | #include "board-mx31lilly.h" |
49 | #include "common.h" | ||
50 | #include "devices-imx31.h" | 50 | #include "devices-imx31.h" |
51 | #include "iomux-mx3.h" | 51 | #include "iomux-mx3.h" |
52 | 52 | ||
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 @@ | |||
40 | #include <asm/setup.h> | 40 | #include <asm/setup.h> |
41 | 41 | ||
42 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
43 | #include <mach/common.h> | ||
44 | #include <mach/ulpi.h> | 43 | #include <mach/ulpi.h> |
45 | 44 | ||
46 | #include "board-mx31lite.h" | 45 | #include "board-mx31lite.h" |
46 | #include "common.h" | ||
47 | #include "devices-imx31.h" | 47 | #include "devices-imx31.h" |
48 | #include "iomux-mx3.h" | 48 | #include "iomux-mx3.h" |
49 | 49 | ||
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 @@ | |||
42 | #include <asm/mach/time.h> | 42 | #include <asm/mach/time.h> |
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | #include <asm/memblock.h> | 44 | #include <asm/memblock.h> |
45 | #include <mach/common.h> | ||
46 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
47 | #include <mach/ulpi.h> | 46 | #include <mach/ulpi.h> |
48 | #include <linux/platform_data/asoc-imx-ssi.h> | 47 | #include <linux/platform_data/asoc-imx-ssi.h> |
49 | 48 | ||
50 | #include "board-mx31moboard.h" | 49 | #include "board-mx31moboard.h" |
50 | #include "common.h" | ||
51 | #include "devices-imx31.h" | 51 | #include "devices-imx31.h" |
52 | #include "iomux-mx3.h" | 52 | #include "iomux-mx3.h" |
53 | 53 | ||
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 @@ | |||
44 | #include <asm/memblock.h> | 44 | #include <asm/memblock.h> |
45 | 45 | ||
46 | #include <mach/hardware.h> | 46 | #include <mach/hardware.h> |
47 | #include <mach/common.h> | ||
48 | #include <video/platform_lcd.h> | 47 | #include <video/platform_lcd.h> |
49 | 48 | ||
50 | #include <media/soc_camera.h> | 49 | #include <media/soc_camera.h> |
51 | 50 | ||
52 | #include "3ds_debugboard.h" | 51 | #include "3ds_debugboard.h" |
52 | #include "common.h" | ||
53 | #include "devices-imx35.h" | 53 | #include "devices-imx35.h" |
54 | #include "iomux-mx35.h" | 54 | #include "iomux-mx35.h" |
55 | 55 | ||
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 @@ | |||
24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | 26 | ||
27 | #include <mach/common.h> | ||
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | 28 | ||
30 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
@@ -33,6 +32,7 @@ | |||
33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/time.h> | 33 | #include <asm/mach/time.h> |
35 | 34 | ||
35 | #include "common.h" | ||
36 | #include "devices-imx50.h" | 36 | #include "devices-imx50.h" |
37 | #include "iomux-mx50.h" | 37 | #include "iomux-mx50.h" |
38 | 38 | ||
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 @@ | |||
20 | #include <asm/mach/time.h> | 20 | #include <asm/mach/time.h> |
21 | 21 | ||
22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
23 | #include <mach/common.h> | ||
24 | 23 | ||
25 | #include "3ds_debugboard.h" | 24 | #include "3ds_debugboard.h" |
25 | #include "common.h" | ||
26 | #include "devices-imx51.h" | 26 | #include "devices-imx51.h" |
27 | #include "iomux-mx51.h" | 27 | #include "iomux-mx51.h" |
28 | 28 | ||
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 @@ | |||
20 | #include <linux/spi/flash.h> | 20 | #include <linux/spi/flash.h> |
21 | #include <linux/spi/spi.h> | 21 | #include <linux/spi/spi.h> |
22 | 22 | ||
23 | #include <mach/common.h> | ||
24 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
25 | 24 | ||
26 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
@@ -28,6 +27,7 @@ | |||
28 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
29 | #include <asm/mach/time.h> | 28 | #include <asm/mach/time.h> |
30 | 29 | ||
30 | #include "common.h" | ||
31 | #include "devices-imx51.h" | 31 | #include "devices-imx51.h" |
32 | #include "cpu_op-mx51.h" | 32 | #include "cpu_op-mx51.h" |
33 | #include "iomux-mx51.h" | 33 | #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 @@ | |||
21 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
22 | #include <linux/i2c.h> | 22 | #include <linux/i2c.h> |
23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
24 | #include <mach/common.h> | ||
25 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
@@ -30,6 +29,7 @@ | |||
30 | #include <linux/gpio.h> | 29 | #include <linux/gpio.h> |
31 | #include <linux/i2c/pca953x.h> | 30 | #include <linux/i2c/pca953x.h> |
32 | 31 | ||
32 | #include "common.h" | ||
33 | #include "devices-imx27.h" | 33 | #include "devices-imx27.h" |
34 | #include "iomux-mx27.h" | 34 | #include "iomux-mx27.h" |
35 | 35 | ||
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 @@ | |||
32 | 32 | ||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
35 | #include <mach/common.h> | ||
36 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
37 | #include <asm/mach/time.h> | 36 | #include <asm/mach/time.h> |
38 | #include <mach/ulpi.h> | 37 | #include <mach/ulpi.h> |
39 | 38 | ||
39 | #include "common.h" | ||
40 | #include "devices-imx27.h" | 40 | #include "devices-imx27.h" |
41 | #include "iomux-mx27.h" | 41 | #include "iomux-mx27.h" |
42 | 42 | ||
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 @@ | |||
42 | #include <asm/mach/time.h> | 42 | #include <asm/mach/time.h> |
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | #include <asm/memblock.h> | 44 | #include <asm/memblock.h> |
45 | #include <mach/common.h> | ||
46 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
47 | #include <mach/ulpi.h> | 46 | #include <mach/ulpi.h> |
48 | 47 | ||
48 | #include "common.h" | ||
49 | #include "devices-imx31.h" | 49 | #include "devices-imx31.h" |
50 | #include "iomux-mx3.h" | 50 | #include "iomux-mx3.h" |
51 | #include "pcm037.h" | 51 | #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 @@ | |||
11 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
12 | #include <linux/spi/spi.h> | 12 | #include <linux/spi/spi.h> |
13 | 13 | ||
14 | #include <mach/common.h> | ||
15 | |||
16 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
17 | 15 | ||
18 | #include "pcm037.h" | 16 | #include "pcm037.h" |
17 | #include "common.h" | ||
19 | #include "devices-imx31.h" | 18 | #include "devices-imx31.h" |
20 | #include "iomux-mx3.h" | 19 | #include "iomux-mx3.h" |
21 | 20 | ||
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 @@ | |||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
35 | 35 | ||
36 | #include <mach/common.h> | ||
37 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
38 | #include <mach/ulpi.h> | 37 | #include <mach/ulpi.h> |
39 | 38 | ||
40 | #include "board-pcm038.h" | 39 | #include "board-pcm038.h" |
40 | #include "common.h" | ||
41 | #include "devices-imx27.h" | 41 | #include "devices-imx27.h" |
42 | #include "iomux-mx27.h" | 42 | #include "iomux-mx27.h" |
43 | 43 | ||
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 @@ | |||
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
35 | 35 | ||
36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
37 | #include <mach/common.h> | ||
38 | #include <mach/ulpi.h> | 37 | #include <mach/ulpi.h> |
39 | 38 | ||
39 | #include "common.h" | ||
40 | #include "devices-imx35.h" | 40 | #include "devices-imx35.h" |
41 | #include "iomux-mx35.h" | 41 | #include "iomux-mx35.h" |
42 | 42 | ||
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 @@ | |||
26 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
27 | #include <asm/mach/time.h> | 27 | #include <asm/mach/time.h> |
28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
29 | #include <mach/common.h> | ||
30 | #include <asm/page.h> | 29 | #include <asm/page.h> |
31 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
32 | 31 | ||
32 | #include "common.h" | ||
33 | #include "devices-imx31.h" | 33 | #include "devices-imx31.h" |
34 | #include "iomux-mx3.h" | 34 | #include "iomux-mx3.h" |
35 | 35 | ||
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 @@ | |||
20 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
21 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
22 | 22 | ||
23 | #include <mach/common.h> | ||
24 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
25 | 24 | ||
25 | #include "common.h" | ||
26 | #include "devices-imx1.h" | 26 | #include "devices-imx1.h" |
27 | #include "iomux-mx1.h" | 27 | #include "iomux-mx1.h" |
28 | 28 | ||
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 @@ | |||
29 | #include <asm/mach/time.h> | 29 | #include <asm/mach/time.h> |
30 | 30 | ||
31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <mach/common.h> | ||
33 | 32 | ||
34 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
35 | #include <linux/i2c/at24.h> | 34 | #include <linux/i2c/at24.h> |
36 | #include <linux/mfd/mc13xxx.h> | 35 | #include <linux/mfd/mc13xxx.h> |
37 | 36 | ||
37 | #include "common.h" | ||
38 | #include "devices-imx35.h" | 38 | #include "devices-imx35.h" |
39 | #include "iomux-mx35.h" | 39 | #include "iomux-mx35.h" |
40 | 40 | ||
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 @@ | |||
22 | 22 | ||
23 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
24 | 24 | ||
25 | #include <mach/common.h> | ||
26 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
27 | 26 | ||
27 | #include "common.h" | ||
28 | #include "iomux-v1.h" | 28 | #include "iomux-v1.h" |
29 | 29 | ||
30 | static struct map_desc imx_io_desc[] __initdata = { | 30 | 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 @@ | |||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/pinctrl/machine.h> | 23 | #include <linux/pinctrl/machine.h> |
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <mach/common.h> | ||
26 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
28 | 27 | ||
28 | #include "common.h" | ||
29 | #include "devices/devices-common.h" | 29 | #include "devices/devices-common.h" |
30 | #include "iomux-v1.h" | 30 | #include "iomux-v1.h" |
31 | 31 | ||
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 @@ | |||
24 | #include <asm/pgtable.h> | 24 | #include <asm/pgtable.h> |
25 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
26 | 26 | ||
27 | #include <mach/common.h> | ||
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | #include <mach/mx25.h> | 28 | #include <mach/mx25.h> |
30 | 29 | ||
30 | #include "common.h" | ||
31 | #include "devices/devices-common.h" | 31 | #include "devices/devices-common.h" |
32 | #include "iomux-v3.h" | 32 | #include "iomux-v3.h" |
33 | 33 | ||
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 @@ | |||
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/pinctrl/machine.h> | 23 | #include <linux/pinctrl/machine.h> |
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <mach/common.h> | ||
26 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
28 | 27 | ||
28 | #include "common.h" | ||
29 | #include "devices/devices-common.h" | 29 | #include "devices/devices-common.h" |
30 | #include "iomux-v1.h" | 30 | #include "iomux-v1.h" |
31 | 31 | ||
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 @@ | |||
26 | #include <asm/hardware/cache-l2x0.h> | 26 | #include <asm/hardware/cache-l2x0.h> |
27 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
28 | 28 | ||
29 | #include <mach/common.h> | ||
30 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
31 | 30 | ||
31 | #include "common.h" | ||
32 | #include "crmregs-imx3.h" | 32 | #include "crmregs-imx3.h" |
33 | #include "devices/devices-common.h" | 33 | #include "devices/devices-common.h" |
34 | #include "iomux-v3.h" | 34 | #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 @@ | |||
19 | #include <asm/mach/map.h> | 19 | #include <asm/mach/map.h> |
20 | 20 | ||
21 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
22 | #include <mach/common.h> | ||
23 | 22 | ||
23 | #include "common.h" | ||
24 | #include "devices/devices-common.h" | 24 | #include "devices/devices-common.h" |
25 | #include "iomux-v3.h" | 25 | #include "iomux-v3.h" |
26 | 26 | ||
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 @@ | |||
31 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
32 | 32 | ||
33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
34 | #include <mach/common.h> | ||
35 | 34 | ||
36 | #include "board-mx31lilly.h" | 35 | #include "board-mx31lilly.h" |
36 | #include "common.h" | ||
37 | #include "devices-imx31.h" | 37 | #include "devices-imx31.h" |
38 | #include "iomux-mx3.h" | 38 | #include "iomux-mx3.h" |
39 | 39 | ||
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 @@ | |||
32 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
33 | 33 | ||
34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
35 | #include <mach/common.h> | ||
36 | 35 | ||
37 | #include "board-mx31lite.h" | 36 | #include "board-mx31lite.h" |
37 | #include "common.h" | ||
38 | #include "devices-imx31.h" | 38 | #include "devices-imx31.h" |
39 | #include "iomux-mx3.h" | 39 | #include "iomux-mx3.h" |
40 | 40 | ||
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 @@ | |||
22 | 22 | ||
23 | #include <linux/usb/otg.h> | 23 | #include <linux/usb/otg.h> |
24 | 24 | ||
25 | #include <mach/common.h> | ||
26 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
27 | #include <mach/ulpi.h> | 26 | #include <mach/ulpi.h> |
28 | 27 | ||
28 | #include "common.h" | ||
29 | #include "devices-imx31.h" | 29 | #include "devices-imx31.h" |
30 | #include "iomux-mx3.h" | 30 | #include "iomux-mx3.h" |
31 | 31 | ||
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 @@ | |||
24 | 24 | ||
25 | #include <linux/usb/otg.h> | 25 | #include <linux/usb/otg.h> |
26 | 26 | ||
27 | #include <mach/common.h> | ||
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | #include <mach/ulpi.h> | 28 | #include <mach/ulpi.h> |
30 | 29 | ||
31 | #include <media/soc_camera.h> | 30 | #include <media/soc_camera.h> |
32 | 31 | ||
32 | #include "common.h" | ||
33 | #include "devices-imx31.h" | 33 | #include "devices-imx31.h" |
34 | #include "iomux-mx3.h" | 34 | #include "iomux-mx3.h" |
35 | 35 | ||
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 @@ | |||
23 | #include <linux/usb/otg.h> | 23 | #include <linux/usb/otg.h> |
24 | #include <linux/usb/ulpi.h> | 24 | #include <linux/usb/ulpi.h> |
25 | 25 | ||
26 | #include <mach/common.h> | ||
27 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
28 | #include <mach/ulpi.h> | 27 | #include <mach/ulpi.h> |
29 | 28 | ||
30 | #include <media/soc_camera.h> | 29 | #include <media/soc_camera.h> |
31 | 30 | ||
32 | #include "board-mx31moboard.h" | 31 | #include "board-mx31moboard.h" |
32 | #include "common.h" | ||
33 | #include "devices-imx31.h" | 33 | #include "devices-imx31.h" |
34 | #include "iomux-mx3.h" | 34 | #include "iomux-mx3.h" |
35 | 35 | ||
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 @@ | |||
23 | 23 | ||
24 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
25 | 25 | ||
26 | #include <mach/common.h> | ||
27 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
28 | 27 | ||
28 | #include "common.h" | ||
29 | #include "devices-imx27.h" | 29 | #include "devices-imx27.h" |
30 | #include "iomux-mx27.h" | 30 | #include "iomux-mx27.h" |
31 | 31 | ||
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 @@ | |||
16 | #include <asm/smp_scu.h> | 16 | #include <asm/smp_scu.h> |
17 | #include <asm/hardware/gic.h> | 17 | #include <asm/hardware/gic.h> |
18 | #include <asm/mach/map.h> | 18 | #include <asm/mach/map.h> |
19 | #include <mach/common.h> | ||
20 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
21 | 20 | ||
21 | #include "common.h" | ||
22 | |||
22 | static void __iomem *scu_base; | 23 | static void __iomem *scu_base; |
23 | 24 | ||
24 | static struct map_desc scu_io_desc __initdata = { | 25 | 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 @@ | |||
9 | * http://www.gnu.org/copyleft/gpl.html | 9 | * http://www.gnu.org/copyleft/gpl.html |
10 | */ | 10 | */ |
11 | #include <linux/io.h> | 11 | #include <linux/io.h> |
12 | #include <mach/common.h> | ||
13 | #include <mach/hardware.h> | 12 | #include <mach/hardware.h> |
13 | |||
14 | #include "common.h" | ||
14 | #include "crmregs-imx3.h" | 15 | #include "crmregs-imx3.h" |
15 | #include "devices/devices-common.h" | 16 | #include "devices/devices-common.h" |
16 | 17 | ||
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 @@ | |||
16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
17 | #include <asm/system_misc.h> | 17 | #include <asm/system_misc.h> |
18 | #include <asm/tlbflush.h> | 18 | #include <asm/tlbflush.h> |
19 | #include <mach/common.h> | ||
20 | #include <mach/cpuidle.h> | 19 | #include <mach/cpuidle.h> |
21 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
21 | |||
22 | #include "common.h" | ||
22 | #include "crm-regs-imx5.h" | 23 | #include "crm-regs-imx5.h" |
23 | 24 | ||
24 | /* | 25 | /* |
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 @@ | |||
18 | #include <asm/proc-fns.h> | 18 | #include <asm/proc-fns.h> |
19 | #include <asm/suspend.h> | 19 | #include <asm/suspend.h> |
20 | #include <asm/hardware/cache-l2x0.h> | 20 | #include <asm/hardware/cache-l2x0.h> |
21 | #include <mach/common.h> | ||
22 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
23 | 22 | ||
23 | #include "common.h" | ||
24 | |||
24 | extern unsigned long phys_l2x0_saved_regs; | 25 | extern unsigned long phys_l2x0_saved_regs; |
25 | 26 | ||
26 | static int imx6q_suspend_finish(unsigned long val) | 27 | 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 @@ | |||
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/common.h> | ||
27 | #include <asm/system_misc.h> | 26 | #include <asm/system_misc.h> |
28 | #include <asm/proc-fns.h> | 27 | #include <asm/proc-fns.h> |
29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
30 | 29 | ||
30 | #include "common.h" | ||
31 | |||
31 | static void __iomem *wdog_base; | 32 | static void __iomem *wdog_base; |
32 | 33 | ||
33 | /* | 34 | /* |
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 @@ | |||
30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
31 | #include <asm/sched_clock.h> | 31 | #include <asm/sched_clock.h> |
32 | #include <asm/mach/time.h> | 32 | #include <asm/mach/time.h> |
33 | #include <mach/common.h> | 33 | |
34 | #include "common.h" | ||
34 | 35 | ||
35 | /* | 36 | /* |
36 | * There are 2 versions of the timer hardware on Freescale MXC hardware. | 37 | * 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 @@ | |||
22 | #include <asm/exception.h> | 22 | #include <asm/exception.h> |
23 | 23 | ||
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <mach/common.h> | ||
26 | #include <mach/irqs.h> | 25 | #include <mach/irqs.h> |
27 | 26 | ||
27 | #include "common.h" | ||
28 | #include "irq-common.h" | 28 | #include "irq-common.h" |
29 | 29 | ||
30 | /* | 30 | /* |