git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx27_3ds.c
diff --git
a/arch/arm/mach-imx/mach-mx27_3ds.c
b/arch/arm/mach-imx/mach-mx27_3ds.c
index
e66ffaa
..
b8bbd31
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/
arch/arm/mach-imx/mach-mx27_3ds.c
@@
-33,7
+33,7
@@
#include "devices-imx27.h"
#include "devices.h"
#include "devices-imx27.h"
#include "devices.h"
-static
unsigned int mx27pdk_pins[]
= {
+static
const int mx27pdk_pins[] __initconst
= {
/* UART1 */
PE12_PF_UART1_TXD,
PE13_PF_UART1_RXD,
/* UART1 */
PE12_PF_UART1_TXD,
PE13_PF_UART1_RXD,
@@
-64,10
+64,6
@@
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
.flags = IMXUART_HAVE_RTSCTS,
};
-static struct platform_device *platform_devices[] __initdata = {
- &mxc_fec_device,
-};
-
/*
* Matrix keyboard
*/
/*
* Matrix keyboard
*/
@@
-94,7
+90,7
@@
static void __init mx27pdk_init(void)
mxc_gpio_setup_multiple_pins(mx27pdk_pins, ARRAY_SIZE(mx27pdk_pins),
"mx27pdk");
imx27_add_imx_uart0(&uart_pdata);
mxc_gpio_setup_multiple_pins(mx27pdk_pins, ARRAY_SIZE(mx27pdk_pins),
"mx27pdk");
imx27_add_imx_uart0(&uart_pdata);
-
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)
);
+
imx27_add_fec(NULL
);
mxc_register_device(&imx_kpp_device, &mx27_3ds_keymap_data);
}
mxc_register_device(&imx_kpp_device, &mx27_3ds_keymap_data);
}
@@
-109,8
+105,6
@@
static struct sys_timer mx27pdk_timer = {
MACHINE_START(MX27_3DS, "Freescale MX27PDK")
/* maintainer: Freescale Semiconductor, Inc. */
MACHINE_START(MX27_3DS, "Freescale MX27PDK")
/* maintainer: Freescale Semiconductor, Inc. */
- .phys_io = MX27_AIPI_BASE_ADDR,
- .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.boot_params = MX27_PHYS_OFFSET + 0x100,
.map_io = mx27_map_io,
.init_irq = mx27_init_irq,
.boot_params = MX27_PHYS_OFFSET + 0x100,
.map_io = mx27_map_io,
.init_irq = mx27_init_irq,