1 files changed, 32 insertions, 13 deletions

diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c
index 65873037e02a..c699f3984d4b 100644
--- a/arch/arm/mach-at91rm9200/board-dk.c
+++ b/arch/arm/mach-at91rm9200/board-dk.c
@@ -37,20 +37,11 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/hardware.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
 
 #include "generic.h"
 
-static void __init dk_init_irq(void)
-{
-        /* Initialize AIC controller */
-        at91rm9200_init_irq(NULL);
-
-        /* Set up the GPIO interrupts */
-        at91_gpio_irq_setup(BGA_GPIO_BANKS);
-}
 
 /*
  * Serial port configuration.
@@ -65,10 +56,8 @@ static struct at91_uart_config __initdata dk_uart_config = {
 
 static void __init dk_map_io(void)
 {
-        at91rm9200_map_io();
-
-        /* Initialize clocks: 18.432 MHz crystal */
-        at91_clock_init(18432000);
+        /* Initialize processor: 18.432 MHz crystal */
+        at91rm9200_initialize(18432000, AT91RM9200_BGA);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
@@ -77,6 +66,11 @@ static void __init dk_map_io(void)
         at91_init_serial(&dk_uart_config);
 }
 
+static void __init dk_init_irq(void)
+{
+        at91rm9200_init_interrupts(NULL);
+}
+
 static struct at91_eth_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
@@ -128,6 +122,29 @@ static struct spi_board_info dk_spi_devices[] = {
 #endif
 };
 
+static struct mtd_partition __initdata dk_nand_partition[] = {
+        {
+                .name   = "NAND Partition 1",
+                .offset = 0,
+                .size   = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct mtd_partition *nand_partitions(int size, int *num_partitions)
+{
+        *num_partitions = ARRAY_SIZE(dk_nand_partition);
+        return dk_nand_partition;
+}
+
+static struct at91_nand_data __initdata dk_nand_data = {
+        .ale            = 22,
+        .cle            = 21,
+        .det_pin        = AT91_PIN_PB1,
+        .rdy_pin        = AT91_PIN_PC2,
+        // .enable_pin  = ... not there
+        .partition_info = nand_partitions,
+};
+
 static void __init dk_board_init(void)
 {
         /* Serial */
@@ -153,6 +170,8 @@ static void __init dk_board_init(void)
         at91_set_gpio_output(AT91_PIN_PB7, 1);  /* this MMC card slot can optionally use SPI signaling (CS3). */
         at91_add_device_mmc(&dk_mmc_data);
 #endif
+        /* NAND */
+        at91_add_device_nand(&dk_nand_data);
         /* VGA */
 //      dk_add_device_video();
 }