1 files changed, 7 insertions, 15 deletions

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 5ba3cb2daaa0..6d8889342c9f 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -80,17 +80,14 @@ static struct davinci_nand_pdata davinci_nand_data = {
         .options                = 0,
 };
 
-#define DAVINCI_ASYNC_EMIF_CONTROL_BASE         0x20008000
-#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE        0x42000000
-
 static struct resource davinci_nand_resources[] = {
         {
-                .start          = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,
-                .end            = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,
+                .start          = DM646X_ASYNC_EMIF_CS2_SPACE_BASE,
+                .end            = DM646X_ASYNC_EMIF_CS2_SPACE_BASE + SZ_32M - 1,
                 .flags          = IORESOURCE_MEM,
         }, {
-                .start          = DAVINCI_ASYNC_EMIF_CONTROL_BASE,
-                .end            = DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,
+                .start          = DM646X_ASYNC_EMIF_CONTROL_BASE,
+                .end            = DM646X_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,
                 .flags          = IORESOURCE_MEM,
         },
 };
@@ -736,17 +733,12 @@ static __init void evm_init(void)
         platform_device_register(&davinci_nand_device);
 
         if (HAS_ATA)
-                dm646x_init_ide();
+                davinci_init_ide();
 
         soc_info->emac_pdata->phy_mask = DM646X_EVM_PHY_MASK;
         soc_info->emac_pdata->mdio_max_freq = DM646X_EVM_MDIO_FREQUENCY;
 }
 
-static __init void davinci_dm646x_evm_irq_init(void)
-{
-        davinci_irq_init();
-}
-
 #define DM646X_EVM_REF_FREQ             27000000
 #define DM6467T_EVM_REF_FREQ            33000000
 
@@ -763,7 +755,7 @@ MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM")
         .io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
         .boot_params  = (0x80000100),
         .map_io       = davinci_map_io,
-        .init_irq     = davinci_dm646x_evm_irq_init,
+        .init_irq     = davinci_irq_init,
         .timer        = &davinci_timer,
         .init_machine = evm_init,
 MACHINE_END
@@ -773,7 +765,7 @@ MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM")
         .io_pg_offst  = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
         .boot_params  = (0x80000100),
         .map_io       = davinci_map_io,
-        .init_irq     = davinci_dm646x_evm_irq_init,
+        .init_irq     = davinci_irq_init,
         .timer        = &davinci_timer,
         .init_machine = evm_init,
 MACHINE_END