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 'imx/devel' into next/dt
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx1ads.c
diff --git
a/arch/arm/mach-imx/mach-mx1ads.c
b/arch/arm/mach-imx/mach-mx1ads.c
index
5cd8bee
..
fc49785
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx1ads.c
+++ b/
arch/arm/mach-imx/mach-mx1ads.c
@@
-68,23
+68,16
@@
static const struct imxuart_platform_data uart1_pdata __initconst = {
* Physmap flash
*/
* Physmap flash
*/
-static
struct physmap_flash_data mx1ads_flash_data
= {
+static
const struct physmap_flash_data mx1ads_flash_data __initconst
= {
.width = 4, /* bankwidth in bytes */
};
.width = 4, /* bankwidth in bytes */
};
-static
struct resource flash_resource
= {
+static
const struct resource flash_resource __initconst
= {
.start = MX1_CS0_PHYS,
.end = MX1_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
.start = MX1_CS0_PHYS,
.end = MX1_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
-static struct platform_device flash_device = {
- .name = "physmap-flash",
- .id = 0,
- .resource = &flash_resource,
- .num_resources = 1,
-};
-
/*
* I2C
*/
/*
* I2C
*/
@@
-125,7
+118,9
@@
static void __init mx1ads_init(void)
imx1_add_imx_uart1(&uart1_pdata);
/* Physmap flash */
imx1_add_imx_uart1(&uart1_pdata);
/* Physmap flash */
- mxc_register_device(&flash_device, &mx1ads_flash_data);
+ platform_device_register_resndata(NULL, "physmap-flash", 0,
+ &flash_resource, 1,
+ &mx1ads_flash_data, sizeof(mx1ads_flash_data));
/* I2C */
i2c_register_board_info(0, mx1ads_i2c_devices,
/* I2C */
i2c_register_board_info(0, mx1ads_i2c_devices,
@@
-145,19
+140,21
@@
struct sys_timer mx1ads_timer = {
MACHINE_START(MX1ADS, "Freescale MX1ADS")
/* Maintainer: Sascha Hauer, Pengutronix */
MACHINE_START(MX1ADS, "Freescale MX1ADS")
/* Maintainer: Sascha Hauer, Pengutronix */
- .
boot_params = MX1_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
+ .handle_irq = imx1_handle_irq,
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END
MACHINE_START(MXLADS, "Freescale MXLADS")
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END
MACHINE_START(MXLADS, "Freescale MXLADS")
- .
boot_params = MX1_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
.map_io = mx1_map_io,
.init_early = imx1_init_early,
.init_irq = mx1_init_irq,
+ .handle_irq = imx1_handle_irq,
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END
.timer = &mx1ads_timer,
.init_machine = mx1ads_init,
MACHINE_END