diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-29 03:17:03 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:19:44 -0400 |
commit | bff0b53bd77df7e44a1d6b1a13162e26def5d17a (patch) | |
tree | 33a160a8398a85274d9bfa227696dcc7580fdc55 /arch/arm/mach-mx2 | |
parent | f231ea441a6e4b025d971b023ff010094626fdb0 (diff) |
PCM038: Remove unnecessary ifdefs, reorder includes alphabetically
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r-- | arch/arm/mach-mx2/pcm038.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-mx2/pcm970-baseboard.c | 8 |
2 files changed, 13 insertions, 18 deletions
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index 35fb96fe933c..a4628d004343 100644 --- a/arch/arm/mach-mx2/pcm038.c +++ b/arch/arm/mach-mx2/pcm038.c | |||
@@ -17,24 +17,23 @@ | |||
17 | * MA 02110-1301, USA. | 17 | * MA 02110-1301, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/platform_device.h> | ||
21 | #include <linux/mtd/physmap.h> | ||
22 | #include <linux/mtd/plat-ram.h> | ||
23 | #include <linux/io.h> | ||
24 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
25 | #include <linux/i2c/at24.h> | 21 | #include <linux/i2c/at24.h> |
22 | #include <linux/io.h> | ||
23 | #include <linux/mtd/plat-ram.h> | ||
24 | #include <linux/mtd/physmap.h> | ||
25 | #include <linux/platform_device.h> | ||
26 | 26 | ||
27 | #include <asm/mach/arch.h> | ||
28 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | #include <asm/mach/arch.h> | ||
29 | #include <asm/mach/time.h> | ||
30 | |||
31 | #include <mach/board-pcm038.h> | ||
29 | #include <mach/common.h> | 32 | #include <mach/common.h> |
30 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
31 | #include <mach/iomux.h> | ||
32 | #ifdef CONFIG_I2C_IMX | ||
33 | #include <mach/i2c.h> | 34 | #include <mach/i2c.h> |
34 | #endif | 35 | #include <mach/iomux.h> |
35 | #include <asm/mach/time.h> | ||
36 | #include <mach/imx-uart.h> | 36 | #include <mach/imx-uart.h> |
37 | #include <mach/board-pcm038.h> | ||
38 | #include <mach/mxc_nand.h> | 37 | #include <mach/mxc_nand.h> |
39 | 38 | ||
40 | #include "devices.h" | 39 | #include "devices.h" |
@@ -176,7 +175,6 @@ static void __init pcm038_init_sram(void) | |||
176 | __raw_writel(0x22220a00, CSCR_A(1)); | 175 | __raw_writel(0x22220a00, CSCR_A(1)); |
177 | } | 176 | } |
178 | 177 | ||
179 | #ifdef CONFIG_I2C_IMX | ||
180 | static struct imxi2c_platform_data pcm038_i2c_1_data = { | 178 | static struct imxi2c_platform_data pcm038_i2c_1_data = { |
181 | .bitrate = 100000, | 179 | .bitrate = 100000, |
182 | }; | 180 | }; |
@@ -201,7 +199,6 @@ static struct i2c_board_info pcm038_i2c_devices[] = { | |||
201 | .type = "lm75" | 199 | .type = "lm75" |
202 | } | 200 | } |
203 | }; | 201 | }; |
204 | #endif | ||
205 | 202 | ||
206 | static void __init pcm038_init(void) | 203 | static void __init pcm038_init(void) |
207 | { | 204 | { |
@@ -217,13 +214,11 @@ static void __init pcm038_init(void) | |||
217 | mxc_gpio_mode(PE16_AF_OWIRE); | 214 | mxc_gpio_mode(PE16_AF_OWIRE); |
218 | mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); | 215 | mxc_register_device(&mxc_nand_device, &pcm038_nand_board_info); |
219 | 216 | ||
220 | #ifdef CONFIG_I2C_IMX | ||
221 | /* only the i2c master 1 is used on this CPU card */ | 217 | /* only the i2c master 1 is used on this CPU card */ |
222 | i2c_register_board_info(1, pcm038_i2c_devices, | 218 | i2c_register_board_info(1, pcm038_i2c_devices, |
223 | ARRAY_SIZE(pcm038_i2c_devices)); | 219 | ARRAY_SIZE(pcm038_i2c_devices)); |
224 | 220 | ||
225 | mxc_register_device(&mxc_i2c_device1, &pcm038_i2c_1_data); | 221 | mxc_register_device(&mxc_i2c_device1, &pcm038_i2c_1_data); |
226 | #endif | ||
227 | 222 | ||
228 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 223 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
229 | 224 | ||
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c index 6dcd625f3f40..6a3acaf57dd4 100644 --- a/arch/arm/mach-mx2/pcm970-baseboard.c +++ b/arch/arm/mach-mx2/pcm970-baseboard.c | |||
@@ -16,17 +16,17 @@ | |||
16 | * MA 02110-1301, USA. | 16 | * MA 02110-1301, USA. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/platform_device.h> | ||
20 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
21 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | #include <linux/platform_device.h> | ||
22 | 22 | ||
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | ||
26 | #include <mach/common.h> | 25 | #include <mach/common.h> |
27 | #include <mach/mmc.h> | ||
28 | #include <mach/imxfb.h> | ||
29 | #include <mach/iomux.h> | 26 | #include <mach/iomux.h> |
27 | #include <mach/imxfb.h> | ||
28 | #include <mach/hardware.h> | ||
29 | #include <mach/mmc.h> | ||
30 | 30 | ||
31 | #include "devices.h" | 31 | #include "devices.h" |
32 | 32 | ||