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-imx/mach-imx27lite.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-imx/mach-imx27lite.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx27lite.c | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx27lite.c b/arch/arm/mach-imx/mach-imx27lite.c new file mode 100644 index 000000000000..22a2b5d91213 --- /dev/null +++ b/arch/arm/mach-imx/mach-imx27lite.c | |||
@@ -0,0 +1,90 @@ | |||
1 | /* | ||
2 | * Copyright 2007 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix | ||
3 | * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) | ||
4 | * Copyright 2009 Daniel Schaeffer (daniel.schaeffer@timesys.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | */ | ||
16 | |||
17 | #include <linux/platform_device.h> | ||
18 | #include <linux/gpio.h> | ||
19 | #include <asm/mach-types.h> | ||
20 | #include <asm/mach/arch.h> | ||
21 | #include <asm/mach/time.h> | ||
22 | #include <asm/mach/map.h> | ||
23 | #include <mach/hardware.h> | ||
24 | #include <mach/common.h> | ||
25 | #include <mach/iomux-mx27.h> | ||
26 | |||
27 | #include "devices-imx27.h" | ||
28 | #include "devices.h" | ||
29 | |||
30 | static unsigned int mx27lite_pins[] = { | ||
31 | /* UART1 */ | ||
32 | PE12_PF_UART1_TXD, | ||
33 | PE13_PF_UART1_RXD, | ||
34 | PE14_PF_UART1_CTS, | ||
35 | PE15_PF_UART1_RTS, | ||
36 | /* FEC */ | ||
37 | PD0_AIN_FEC_TXD0, | ||
38 | PD1_AIN_FEC_TXD1, | ||
39 | PD2_AIN_FEC_TXD2, | ||
40 | PD3_AIN_FEC_TXD3, | ||
41 | PD4_AOUT_FEC_RX_ER, | ||
42 | PD5_AOUT_FEC_RXD1, | ||
43 | PD6_AOUT_FEC_RXD2, | ||
44 | PD7_AOUT_FEC_RXD3, | ||
45 | PD8_AF_FEC_MDIO, | ||
46 | PD9_AIN_FEC_MDC, | ||
47 | PD10_AOUT_FEC_CRS, | ||
48 | PD11_AOUT_FEC_TX_CLK, | ||
49 | PD12_AOUT_FEC_RXD0, | ||
50 | PD13_AOUT_FEC_RX_DV, | ||
51 | PD14_AOUT_FEC_RX_CLK, | ||
52 | PD15_AOUT_FEC_COL, | ||
53 | PD16_AIN_FEC_TX_ER, | ||
54 | PF23_AIN_FEC_TX_EN, | ||
55 | }; | ||
56 | |||
57 | static const struct imxuart_platform_data uart_pdata __initconst = { | ||
58 | .flags = IMXUART_HAVE_RTSCTS, | ||
59 | }; | ||
60 | |||
61 | static struct platform_device *platform_devices[] __initdata = { | ||
62 | &mxc_fec_device, | ||
63 | }; | ||
64 | |||
65 | static void __init mx27lite_init(void) | ||
66 | { | ||
67 | mxc_gpio_setup_multiple_pins(mx27lite_pins, ARRAY_SIZE(mx27lite_pins), | ||
68 | "imx27lite"); | ||
69 | imx27_add_imx_uart0(&uart_pdata); | ||
70 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | ||
71 | } | ||
72 | |||
73 | static void __init mx27lite_timer_init(void) | ||
74 | { | ||
75 | mx27_clocks_init(26000000); | ||
76 | } | ||
77 | |||
78 | static struct sys_timer mx27lite_timer = { | ||
79 | .init = mx27lite_timer_init, | ||
80 | }; | ||
81 | |||
82 | MACHINE_START(IMX27LITE, "LogicPD i.MX27LITE") | ||
83 | .phys_io = MX27_AIPI_BASE_ADDR, | ||
84 | .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc, | ||
85 | .boot_params = MX27_PHYS_OFFSET + 0x100, | ||
86 | .map_io = mx27_map_io, | ||
87 | .init_irq = mx27_init_irq, | ||
88 | .init_machine = mx27lite_init, | ||
89 | .timer = &mx27lite_timer, | ||
90 | MACHINE_END | ||