diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 06:16:24 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-07-26 08:27:25 -0400 |
commit | 2dcf78c0eeae3bd07082821557014f25f02ca2e9 (patch) | |
tree | 8ca5c4c7f35c9a9ab07fcd9732124c905e609aa1 /arch/arm/mach-mx3/mach-cpuimx35.c | |
parent | 6b6322676add0fa2713d0ec89a28390fd4d907f5 (diff) | |
parent | 5109a4597f7e758b8d20694392d0361a0b4c43b1 (diff) |
Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD
There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/devices.c
arch/arm/mach-imx/devices.h
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
arch/arm/mach-mx2/Kconfig
arch/arm/mach-mx25/Makefile
arch/arm/mach-mx25/devices.c
arch/arm/plat-mxc/include/mach/mx25.h
arch/arm/plat-mxc/include/mach/mxc_nand.h
Diffstat (limited to 'arch/arm/mach-mx3/mach-cpuimx35.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-cpuimx35.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c index 55caa5cb8bc7..4f6146d31328 100644 --- a/arch/arm/mach-mx3/mach-cpuimx35.c +++ b/arch/arm/mach-mx3/mach-cpuimx35.c | |||
@@ -40,20 +40,20 @@ | |||
40 | #include <mach/board-eukrea_cpuimx35.h> | 40 | #include <mach/board-eukrea_cpuimx35.h> |
41 | #include <mach/hardware.h> | 41 | #include <mach/hardware.h> |
42 | #include <mach/common.h> | 42 | #include <mach/common.h> |
43 | #include <mach/imx-uart.h> | ||
44 | #include <mach/i2c.h> | ||
45 | #include <mach/iomux-mx35.h> | 43 | #include <mach/iomux-mx35.h> |
46 | #include <mach/mxc_nand.h> | 44 | #include <mach/mxc_nand.h> |
47 | #include <mach/mxc_ehci.h> | 45 | #include <mach/mxc_ehci.h> |
48 | #include <mach/ulpi.h> | 46 | #include <mach/ulpi.h> |
49 | 47 | ||
48 | #include "devices-imx35.h" | ||
50 | #include "devices.h" | 49 | #include "devices.h" |
51 | 50 | ||
52 | static struct imxuart_platform_data uart_pdata = { | 51 | static const struct imxuart_platform_data uart_pdata __initconst = { |
53 | .flags = IMXUART_HAVE_RTSCTS, | 52 | .flags = IMXUART_HAVE_RTSCTS, |
54 | }; | 53 | }; |
55 | 54 | ||
56 | static struct imxi2c_platform_data eukrea_cpuimx35_i2c_1_data = { | 55 | static const struct imxi2c_platform_data |
56 | eukrea_cpuimx35_i2c0_data __initconst = { | ||
57 | .bitrate = 50000, | 57 | .bitrate = 50000, |
58 | }; | 58 | }; |
59 | 59 | ||
@@ -134,7 +134,8 @@ static struct pad_desc eukrea_cpuimx35_pads[] = { | |||
134 | MX35_PAD_ATA_DA2__GPIO3_2, | 134 | MX35_PAD_ATA_DA2__GPIO3_2, |
135 | }; | 135 | }; |
136 | 136 | ||
137 | static struct mxc_nand_platform_data pcm037_nand_board_info = { | 137 | static const struct mxc_nand_platform_data |
138 | eukrea_cpuimx35_nand_board_info __initconst = { | ||
138 | .width = 1, | 139 | .width = 1, |
139 | .hw_ecc = 1, | 140 | .hw_ecc = 1, |
140 | .flash_bbt = 1, | 141 | .flash_bbt = 1, |
@@ -181,12 +182,12 @@ static void __init mxc_board_init(void) | |||
181 | 182 | ||
182 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 183 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
183 | 184 | ||
184 | mxc_register_device(&mxc_uart_device0, &uart_pdata); | 185 | imx35_add_imx_uart0(&uart_pdata); |
185 | mxc_register_device(&mxc_nand_device, &pcm037_nand_board_info); | 186 | imx35_add_mxc_nand(&eukrea_cpuimx35_nand_board_info); |
186 | 187 | ||
187 | i2c_register_board_info(0, eukrea_cpuimx35_i2c_devices, | 188 | i2c_register_board_info(0, eukrea_cpuimx35_i2c_devices, |
188 | ARRAY_SIZE(eukrea_cpuimx35_i2c_devices)); | 189 | ARRAY_SIZE(eukrea_cpuimx35_i2c_devices)); |
189 | mxc_register_device(&mxc_i2c_device0, &eukrea_cpuimx35_i2c_1_data); | 190 | imx35_add_imx_i2c0(&eukrea_cpuimx35_i2c0_data); |
190 | 191 | ||
191 | #if defined(CONFIG_USB_ULPI) | 192 | #if defined(CONFIG_USB_ULPI) |
192 | if (otg_mode_host) { | 193 | if (otg_mode_host) { |