diff options
Diffstat (limited to 'arch/arm/mach-at91/board-snapper9260.c')
-rw-r--r-- | arch/arm/mach-at91/board-snapper9260.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 0df01c6..3eb0a11 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c @@ -4,7 +4,7 @@ * Copyright (C) 2010 Bluewater System Ltd * * Author: Andre Renaud <andre@bluewatersys.com> - * Author: Ryan Mallon + * Author: Ryan Mallon <ryan@bluewatersys.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ static void __init snapper9260_init_early(void) { - at91_initialize(18432000); + at91sam9260_initialize(18432000); /* Debug on ttyS0 */ at91_register_uart(0, 0, 0); @@ -55,6 +55,11 @@ static void __init snapper9260_init_early(void) at91_register_uart(AT91SAM9260_ID_US2, 3, 0); } +static void __init snapper9260_init_irq(void) +{ + at91sam9260_init_interrupts(NULL); +} + static struct at91_usbh_data __initdata snapper9260_usbh_data = { .ports = 2, }; @@ -97,12 +102,18 @@ static struct mtd_partition __initdata snapper9260_nand_partitions[] = { }, }; +static struct mtd_partition * __init +snapper9260_nand_partition_info(int size, int *num_partitions) +{ + *num_partitions = ARRAY_SIZE(snapper9260_nand_partitions); + return snapper9260_nand_partitions; +} + static struct atmel_nand_data __initdata snapper9260_nand_data = { .ale = 21, .cle = 22, .rdy_pin = AT91_PIN_PC13, - .parts = snapper9260_nand_partitions, - .num_parts = ARRAY_SIZE(snapper9260_nand_partitions), + .partition_info = snapper9260_nand_partition_info, .bus_width_16 = 0, }; @@ -168,9 +179,9 @@ static void __init snapper9260_board_init(void) MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module") .timer = &at91sam926x_timer, - .map_io = at91_map_io, + .map_io = at91sam9260_map_io, .init_early = snapper9260_init_early, - .init_irq = at91_init_irq_default, + .init_irq = snapper9260_init_irq, .init_machine = snapper9260_board_init, MACHINE_END |